Ottomata has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353992 )
Change subject: Allow setting of zookeeper_version in hiera
......................................................................
Allow setting of zookeeper_version in hiera
Newer versions of Debian Jessie have an updated package version.
Since we don't want to upgrade everything in prod (yet), but still want
to use zookeeper on later Jessie images in labs, we allow overriding via hiera.
Change-Id: I0e69fa992b1076063a04547308812124e514ead8
---
M modules/role/manifests/zookeeper/client.pp
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/zookeeper/client.pp
b/modules/role/manifests/zookeeper/client.pp
index f05f6a6c..f3e54c4 100644
--- a/modules/role/manifests/zookeeper/client.pp
+++ b/modules/role/manifests/zookeeper/client.pp
@@ -2,6 +2,12 @@
# These role classes will configure Zookeeper properly in either
# the labs or production environments.
#
+# To avoid version conflics with Cloudera zookeeper package, this
+# class manually specifies which debian package version should be installed.
+# There are sane defaults for Ubunty Trusty and Debian Jessie
+# (as of 2017-05 the Jessie version needs updated to 3.4.5+dfsg-2+deb8u1).
+# If you need to override this, you may set 'zookeeper_version' in hiera.
+#
# Usage:
#
# If you only need Zookeeper client configs to talk to Zookeeper servers:
@@ -33,10 +39,12 @@
#
class role::zookeeper::client {
- $version = $::lsbdistcodename ? {
- 'jessie' => '3.4.5+dfsg-2',
- 'trusty' => '3.4.5+dfsg-1',
- }
+ $version = hiera('zookeeper_version',
+ $::lsbdistcodename ? {
+ 'jessie' => '3.4.5+dfsg-2',
+ 'trusty' => '3.4.5+dfsg-1',
+ }
+ )
$clusters = hiera('zookeeper_clusters')
$cluster_name = hiera('zookeeper_cluster_name')
--
To view, visit https://gerrit.wikimedia.org/r/353992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e69fa992b1076063a04547308812124e514ead8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[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
