Ottomata has submitted this change and it was merged. Change subject: Puppetizing bits ulsfo varnishes. ......................................................................
Puppetizing bits ulsfo varnishes. TODO: Puppetize ulsfo lvs's for bits. This commit depends on https://gerrit.wikimedia.org/r/#/c/86272/ Change-Id: Ib1eae11d0b2a833b5363a2d79d775fd77fbb0b3a --- M manifests/lvs.pp M manifests/role/cache.pp M manifests/site.pp 3 files changed, 25 insertions(+), 2 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved diff --git a/manifests/lvs.pp b/manifests/lvs.pp index 39c5d8a..a88d20e 100644 --- a/manifests/lvs.pp +++ b/manifests/lvs.pp @@ -312,6 +312,7 @@ 'pmtpa' => { 'bitslb' => "208.80.152.210", 'bitslb6' => "2620:0:860:ed1a::a", 'bitssvc' => "10.2.1.23" }, 'eqiad' => { 'bitslb' => "208.80.154.234", 'bitslb6' => "2620:0:861:ed1a::a", 'bitssvc' => "10.2.2.23" }, 'esams' => { 'bitslb' => "91.198.174.233", 'bitslb6' => "2620:0:862:ed1a::a", 'bitssvc' => "10.2.3.23" }, + 'ulsfo' => { 'bitslb' => "198.35.26.106", 'bitslb6' => "2620:0:863:ed1a::a", 'bitssvc' => "10.2.4.23" }, }, 'upload' => { 'pmtpa' => { 'uploadlb' => "208.80.152.211", 'uploadsvc' => "10.2.1.24" }, diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp index 1a8b5f3..ac05df9 100644 --- a/manifests/role/cache.pp +++ b/manifests/role/cache.pp @@ -13,6 +13,7 @@ @monitor_group { "cache_bits_pmtpa": description => "pmtpa bits Varnish" } @monitor_group { "cache_bits_eqiad": description => "eqiad bits Varnish "} @monitor_group { "cache_bits_esams": description => "esams bits Varnish" } +@monitor_group { "cache_bits_ulsfo": description => "ulsfo bits Varnish" } @monitor_group { "cache_mobile_eqiad": description => "eqiad mobile Varnish" } @monitor_group { "cache_mobile_esams": description => "esams mobile Varnish" } @@ -126,6 +127,7 @@ "pmtpa" => ["sq67.wikimedia.org", "sq68.wikimedia.org", "sq69.wikimedia.org", "sq70.wikimedia.org"], "eqiad" => ['cp1056.eqiad.wmnet', 'cp1057.eqiad.wmnet', 'cp1069.eqiad.wmnet', 'cp1070.eqiad.wmnet'], "esams" => ["cp3019.esams.wikimedia.org", "cp3020.esams.wikimedia.org", "cp3021.esams.wikimedia.org", "cp3022.esams.wikimedia.org"], + "ulsfo" => ["cp4001.ulsfo.wmnet", "cp4002.ulsfo.wmnet", "cp4003.ulsfo.wmnet", "cp4004.ulsfo.wmnet"], }, "upload" => { "pmtpa-squid" => [ @@ -256,6 +258,7 @@ "knsq6.esams.wikimedia.org", "knsq7.esams.wikimedia.org" ], + 'ulsfo' => [], }, "upload" => { "pmtpa" => [ @@ -431,8 +434,8 @@ class varnish::logging::eventlistener { if $::realm == 'production' { $event_listener = $::site ? { - /^(pmtpa|eqiad)$/ => '10.64.21.123', # vanadium - 'esams' => '208.80.154.73', # gadolinium + /^(pmtpa|eqiad|ulsfo)$/ => '10.64.21.123', # vanadium + 'esams' => '208.80.154.73', # gadolinium } varnish::logging { 'kraken' : diff --git a/manifests/site.pp b/manifests/site.pp index 0682312..956eef0 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -416,6 +416,25 @@ include role::cache::bits } +# +# ulsfo varnishes +# + +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": } + + include role::cache::bits +} + +# TODO: cp4005-cp4020, upload, mobile (and text?). + + node "dataset2.wikimedia.org" { $cluster = "misc" -- To view, visit https://gerrit.wikimedia.org/r/86313 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1eae11d0b2a833b5363a2d79d775fd77fbb0b3a Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
