Mobrovac has submitted this change and it was merged.
Change subject: Create event_schemas module for shared use of
mediawiki/event-schemas
......................................................................
Create event_schemas module for shared use of mediawiki/event-schemas
Also add handy kafka profile.sh file
Bug: T126098
Change-Id: I1ec29a7f8a6871a2e44958c6baa20d927ed3ac1d
---
A puppet/modules/eventschemas/manifests/init.pp
A puppet/modules/kafka/files/kafka.profile.sh
M puppet/modules/kafka/manifests/init.pp
M puppet/modules/role/manifests/cirrussearch.pp
4 files changed, 24 insertions(+), 5 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/eventschemas/manifests/init.pp
b/puppet/modules/eventschemas/manifests/init.pp
new file mode 100644
index 0000000..224913d
--- /dev/null
+++ b/puppet/modules/eventschemas/manifests/init.pp
@@ -0,0 +1,11 @@
+# == Class eventschemas
+#
+class eventschemas {
+ $path = "${::service::root_dir}/event-schemas"
+
+ git::clone { 'mediawiki/event-schemas':
+ directory => $path,
+ }
+
+ service::gitupdate { 'event-schemas': }
+}
diff --git a/puppet/modules/kafka/files/kafka.profile.sh
b/puppet/modules/kafka/files/kafka.profile.sh
new file mode 100644
index 0000000..ab3ed80
--- /dev/null
+++ b/puppet/modules/kafka/files/kafka.profile.sh
@@ -0,0 +1,7 @@
+# NOTE: This file is managed by puppet.
+
+# These environment variables are used by the kafka CLI
+# so that you don't have to provide them as arguments
+# every time you use it.
+export ZOOKEEPER_URL=localhost:2181
+export BROKER_LIST=localhost:9092
diff --git a/puppet/modules/kafka/manifests/init.pp
b/puppet/modules/kafka/manifests/init.pp
index 18f5d3f..9c90e3a 100644
--- a/puppet/modules/kafka/manifests/init.pp
+++ b/puppet/modules/kafka/manifests/init.pp
@@ -43,9 +43,9 @@
require => Package['kafka-server'],
}
- git::clone { 'mediawiki/event-schemas':
- directory => "${::service::root_dir}/event-schemas"
+ # Install handy env vars in all shells so we don't have to specify
+ # broker and zookeeper args every time using kafka CLI.
+ file { '/etc/profile.d/kafka.sh':
+ source => 'puppet:///modules/kafka/kafka.profile.sh',
}
-
- service::gitupdate { 'event-schemas': }
}
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index addbf1f..edb9ef2 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -7,6 +7,7 @@
include ::role::pdfhandler
include ::role::cite
include ::elasticsearch
+ include ::eventschemas
# Utilized as part of cirrus logging infrastructure
include ::role::psr3
include ::role::kafka
@@ -73,7 +74,7 @@
settings => template('elasticsearch/CirrusSearch.php.erb'),
require => [
Service['elasticsearch'],
- Git::Clone['mediawiki/event-schemas']
+ Class['eventschemas'],
],
browser_tests => 'tests/browser',
}
--
To view, visit https://gerrit.wikimedia.org/r/271922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ec29a7f8a6871a2e44958c6baa20d927ed3ac1d
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
