BBlack has submitted this change and it was merged. Change subject: T86663 4.3: shuffle roles, no repool yet ......................................................................
T86663 4.3: shuffle roles, no repool yet Change-Id: I24219d994870207d2bec83967d88a452451d3c9a --- M manifests/role/cache.pp M manifests/site.pp 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 2233618..8f738d5 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -72,6 +72,7 @@ 'esams' => [ # T92306 'cp3011.esams.wmnet', # needs-jessie-install 'cp3012.esams.wmnet', + # 'cp3013.esams.wmnet', 'cp3030.esams.wmnet', 'cp3031.esams.wmnet', 'cp3040.esams.wmnet', @@ -148,7 +149,6 @@ 'cp3008.esams.wmnet', 'cp3009.esams.wmnet', 'cp3010.esams.wmnet', - # 'cp3017.esams.wmnet', 'cp3018.esams.wmnet', 'cp3032.esams.wmnet', 'cp3033.esams.wmnet', @@ -175,10 +175,10 @@ 'cp1060.eqiad.wmnet', ], 'esams' => [ - # 'cp3013.esams.wmnet', 'cp3014.esams.wmnet', 'cp3015.esams.wmnet', 'cp3016.esams.wmnet', + # 'cp3017.esams.wmnet', ], 'ulsfo' => [ 'cp4011.ulsfo.wmnet', diff --git a/manifests/site.pp b/manifests/site.pp index a8b94aa..36d9874 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -430,12 +430,12 @@ role cache::bits } -node /^cp301[12]\.esams\.wmnet$/ { +node /^cp301[123]\.esams\.wmnet$/ { interface::add_ip6_mapped { 'main': } role cache::text } -node /^cp30(0[3-9]|10|1[7-8])\.esams\.wmnet$/ { +node /^cp30(0[3-9]|10|18)\.esams\.wmnet$/ { if $::hostname =~ /^cp300[34]$/ { $ganglia_aggregator = true } @@ -445,7 +445,7 @@ role cache::upload } -node /^cp301[3456]\.esams\.wmnet$/ { +node /^cp301[4567]\.esams\.wmnet$/ { interface::add_ip6_mapped { 'main': } role cache::mobile } -- To view, visit https://gerrit.wikimedia.org/r/202967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24219d994870207d2bec83967d88a452451d3c9a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits