Hello jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/353991
to review the following change.
Change subject: Revert "Allow setting of zookeeper_version in hiera"
......................................................................
Revert "Allow setting of zookeeper_version in hiera"
Don't know why there is a varnishkafka submodule change in this. reverting.
This reverts commit 308624ddab49a3ef226ff9834a61a8bb5d95fbda.
Change-Id: I06051215587bf926e235f379167ffe3138b1ec9c
---
M modules/role/manifests/zookeeper/client.pp
M modules/varnishkafka
2 files changed, 5 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/353991/1
diff --git a/modules/role/manifests/zookeeper/client.pp
b/modules/role/manifests/zookeeper/client.pp
index f3e54c4..f05f6a6c 100644
--- a/modules/role/manifests/zookeeper/client.pp
+++ b/modules/role/manifests/zookeeper/client.pp
@@ -2,12 +2,6 @@
# 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:
@@ -39,12 +33,10 @@
#
class role::zookeeper::client {
- $version = hiera('zookeeper_version',
- $::lsbdistcodename ? {
- 'jessie' => '3.4.5+dfsg-2',
- 'trusty' => '3.4.5+dfsg-1',
- }
- )
+ $version = $::lsbdistcodename ? {
+ 'jessie' => '3.4.5+dfsg-2',
+ 'trusty' => '3.4.5+dfsg-1',
+ }
$clusters = hiera('zookeeper_clusters')
$cluster_name = hiera('zookeeper_cluster_name')
diff --git a/modules/varnishkafka b/modules/varnishkafka
index 2243ce7..8822159 160000
--- a/modules/varnishkafka
+++ b/modules/varnishkafka
@@ -1 +1 @@
-Subproject commit 2243ce7124f0154d9e8caf6ef0185b4e07e1a115
+Subproject commit 8822159469238c14aedfaf01d15e27658199a157
--
To view, visit https://gerrit.wikimedia.org/r/353991
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06051215587bf926e235f379167ffe3138b1ec9c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
