BBlack has uploaded a new change for review. https://gerrit.wikimedia.org/r/203087
Change subject: remove pointless (I think!) esams/ulsfo $ganglia_aggregator and cache_upload def for esams ...................................................................... remove pointless (I think!) esams/ulsfo $ganglia_aggregator and cache_upload def for esams Change-Id: Ifed83da3b74cb7b5d78388a7bb65b09cd27b24d4 --- M manifests/site.pp 1 file changed, 0 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/203087/1 diff --git a/manifests/site.pp b/manifests/site.pp index d46311b..56e562d 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -418,12 +418,7 @@ } node /^cp30(0[3-9]|10)\.esams\.wmnet$/ { - if $::hostname =~ /^cp300[34]$/ { - $ganglia_aggregator = true - } - $cluster = 'cache_upload' interface::add_ip6_mapped { 'main': } - role cache::upload } @@ -433,9 +428,6 @@ } node /^cp30(19|2[0-2])\.esams\.wmnet$/ { - if $::hostname =~ /^cp(3019|3020)$/ { - $ganglia_aggregator = true - } interface::add_ip6_mapped { 'main': } role cache::bits } @@ -455,38 +447,21 @@ # node /^cp400[1-4]\.ulsfo\.wmnet$/ { - # cp4001 and cp4003 are in different racks, - # make them each ganglia aggregators. - if $::hostname =~ /^cp(4001|4003)$/ { - $ganglia_aggregator = true - } - interface::add_ip6_mapped { 'main': } role cache::bits } node /^cp40(0[5-7]|1[3-5])\.ulsfo\.wmnet$/ { - if $::hostname =~ /^cp(4005|4013)$/ { - $ganglia_aggregator = true - } - interface::add_ip6_mapped { 'main': } role cache::upload } node /^cp40(0[89]|1[0678])\.ulsfo\.wmnet$/ { - if $::hostname =~ /^cp(4008|4016)$/ { - $ganglia_aggregator = true - } - interface::add_ip6_mapped { 'main': } role cache::text } node /^cp40(1[129]|20)\.ulsfo\.wmnet$/ { - if $::hostname =~ /^cp401[19]$/ { - $ganglia_aggregator = true - } interface::add_ip6_mapped { 'main': } role cache::mobile } -- To view, visit https://gerrit.wikimedia.org/r/203087 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifed83da3b74cb7b5d78388a7bb65b09cd27b24d4 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