[MediaWiki-commits] [Gerrit] T86663 4.2: shuffle roles, no repool yet - change (operations/puppet)

[BBlack (Code Review)]

BBlack has uploaded a new change for review.

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

Change subject: T86663 4.2: shuffle roles, no repool yet
......................................................................

T86663 4.2: shuffle roles, no repool yet

Change-Id: I42722f191a4c1d51903cbfde82779bf8460a72ec
---
M manifests/role/cache.pp
M manifests/site.pp
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/202961/1

diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index e977a1f..c89ffa5 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -71,6 +71,7 @@
                     ],
                     'esams' => [
                         # T92306 'cp3011.esams.wmnet', # needs-jessie-install
+                        # 'cp3012.esams.wmnet',
                         'cp3030.esams.wmnet',
                         'cp3031.esams.wmnet',
                         'cp3040.esams.wmnet',
@@ -149,7 +150,6 @@
                         'cp3008.esams.wmnet',
                         'cp3009.esams.wmnet',
                         'cp3010.esams.wmnet',
-                        # 'cp3016.esams.wmnet',
                         'cp3017.esams.wmnet',
                         'cp3018.esams.wmnet',
                         'cp3032.esams.wmnet',
@@ -176,10 +176,10 @@
                                 'cp1060.eqiad.wmnet',
                     ],
                     'esams' => [
-                                # 'cp3012.esams.wmnet',
                                 'cp3013.esams.wmnet',
                                 'cp3014.esams.wmnet',
                                 'cp3015.esams.wmnet',
+                                # 'cp3016.esams.wmnet',
                     ],
                     'ulsfo' => [
                                 'cp4011.ulsfo.wmnet',
diff --git a/manifests/site.pp b/manifests/site.pp
index 68878e6..a8b94aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -430,12 +430,12 @@
     role cache::bits
 }
 
-node /^cp3011\.esams\.wmnet$/ {
+node /^cp301[12]\.esams\.wmnet$/ {
     interface::add_ip6_mapped { 'main': }
     role cache::text
 }
 
-node /^cp30(0[3-9]|10|1[6-8])\.esams\.wmnet$/ {
+node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ {
     if $::hostname =~ /^cp300[34]$/ {
         $ganglia_aggregator = true
     }
@@ -445,7 +445,7 @@
     role cache::upload
 }
 
-node /^cp301[2345]\.esams\.wmnet$/ {
+node /^cp301[3456]\.esams\.wmnet$/ {
     interface::add_ip6_mapped { 'main': }
     role cache::mobile
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I42722f191a4c1d51903cbfde82779bf8460a72ec
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits