Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/125977

Change subject: Remove pmtpa compute servers from puppet.
......................................................................

Remove pmtpa compute servers from puppet.

RT 7280

Change-Id: I084d05ca3d7e57a19bcd20f225b0b5672a5878ba
---
M manifests/site.pp
M modules/zookeeper
2 files changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/125977/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 3d0581a..c42daf6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2800,22 +2800,6 @@
     include role::nova::api
 }
 
-node /virt([5-9]|1[0-5]).pmtpa.wmnet/ {
-    $cluster = 'virt'
-    if $::hostname =~ /^virt5$/ {
-
-        $ganglia_aggregator = true
-    }
-
-    $openstack_version = 'folsom'
-    $use_neutron = false
-
-    include admins::labs
-
-    include standard
-    include role::nova::compute
-}
-
 node 'labnet1001.eqiad.wmnet' {
     $cluster = 'virt'
     $openstack_version = 'havana'
diff --git a/modules/zookeeper b/modules/zookeeper
index 29c9542..8e831a2 160000
--- a/modules/zookeeper
+++ b/modules/zookeeper
-Subproject commit 29c95428b3379f3e61b0a63fc3b3ec1f1e75c34e
+Subproject commit 8e831a20b22673a9ab3c261b6d43312fc5f2a0cf

-- 
To view, visit https://gerrit.wikimedia.org/r/125977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I084d05ca3d7e57a19bcd20f225b0b5672a5878ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to