Ottomata has submitted this change and it was merged.
Change subject: Adding ulsfo as valid site for lvs_services:text-varnish, bits,
upload and mobile.
......................................................................
Adding ulsfo as valid site for lvs_services:text-varnish, bits, upload and
mobile.
Removing https, ipv6 and text from list of lvs_balancer_ips in ulsfo
Change-Id: Ic03612e1761099f6b9f97c92c53143a5cd4f21d3
---
M manifests/lvs.pp
M manifests/site.pp
2 files changed, 20 insertions(+), 39 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 05881ed..20c85eb 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -145,18 +145,7 @@
'mediawikilb' => "91.198.174.232",
'foundationlb' => "91.198.174.235",
},
- 'ulsfo' => {
- 'textsvc' => "10.2.4.25",
- 'wikipedialb' => "198.35.26.97",
- 'wiktionarylb' => "198.35.26.98",
- 'wikiquotelb' => "198.35.26.99",
- 'wikibookslb' => "198.35.26.100",
- 'wikisourcelb' => "198.35.26.101",
- 'wikinewslb' => "198.35.26.102",
- 'wikiversitylb' => "198.35.26.103",
- 'mediawikilb' => "198.35.26.104",
- 'foundationlb' => "198.35.26.105",
- },
+ 'ulsfo' => {},
},
'text-varnish' => {
'pmtpa' => {
@@ -175,9 +164,19 @@
'wikivoyagelb' => '91.198.174.238',
},
'ulsfo' => {
- 'wikimedialb' => '198.35.26.96',
- 'wikidatalb' => '198.35.26.114',
- 'wikivoyagelb' => '198.35.26.115',
+ 'textsvc' => "10.2.4.25",
+ 'wikimedialb' => '198.35.26.96',
+ 'wikipedialb' => "198.35.26.97",
+ 'wiktionarylb' => "198.35.26.98",
+ 'wikiquotelb' => "198.35.26.99",
+ 'wikibookslb' => "198.35.26.100",
+ 'wikisourcelb' => "198.35.26.101",
+ 'wikinewslb' => "198.35.26.102",
+ 'wikiversitylb' => "198.35.26.103",
+ 'mediawikilb' => "198.35.26.104",
+ 'foundationlb' => "198.35.26.105",
+ 'wikidatalb' => '198.35.26.114',
+ 'wikivoyagelb' => '198.35.26.115',
},
},
'https' => {
@@ -278,6 +277,7 @@
'wikidatalbsecure6' =>
"2620:0:862:ed1a::12",
'wikivoyagelbsecure6' =>
"2620:0:862:ed1a::13"
},
+ 'ulsfo' => {}
},
'ipv6' => {
'pmtpa' => {
@@ -324,23 +324,7 @@
'wikidatalb6' => "2620:0:862:ed1a::12",
'wikivoyagelb6' => "2620:0:862:ed1a::13"
},
- 'ulsfo' => {
- 'wikimedialb6' =>
"2620:0:863:ed1a::0",
- 'wikipedialb6' =>
"2620:0:863:ed1a::1",
- 'wiktionarylb6' =>
"2620:0:863:ed1a::2",
- 'wikiquotelb6' =>
"2620:0:863:ed1a::3",
- 'wikibookslb6' =>
"2620:0:863:ed1a::4",
- 'wikisourcelb6' =>
"2620:0:863:ed1a::5",
- 'wikinewslb6' =>
"2620:0:863:ed1a::6",
- 'wikiversitylb6' =>
"2620:0:863:ed1a::7",
- 'mediawikilb6' =>
"2620:0:863:ed1a::8",
- 'foundationlb6' =>
"2620:0:863:ed1a::9",
- 'bitslb6' =>
"2620:0:863:ed1a::a",
- 'uploadlb6' =>
"2620:0:863:ed1a::b",
- 'mobilelb6' =>
"2620:0:863:ed1a::c",
- 'wikidatalb6' =>
"2620:0:863:ed1a::d",
- 'wikivoyagelb6' =>
"2620:0:863:ed1a::e",
- },
+ 'ulsfo' => {},
},
'bits' => {
'pmtpa' => { 'bitslb' => "208.80.152.210",
'bitslb6' => "2620:0:860:ed1a::a", 'bitssvc' => "10.2.1.23" },
@@ -502,7 +486,7 @@
'text-varnish' => {
'description' => "Main wiki platform LVS service,
text.${::site}.wikimedia.org (Varnish)",
'class' => 'high-traffic1',
- 'sites' => [ 'pmtpa', 'eqiad', 'esams' ],
+ 'sites' => [ 'pmtpa', 'eqiad', 'esams', 'ulsfo' ],
'ip' => $service_ips['text-varnish'][$::site],
'bgp' => 'yes',
'depool-threshold' => '.5',
@@ -545,7 +529,7 @@
"bits" => {
'description' => "Site assets (CSS/JS) LVS service,
bits.${::site}.wikimedia.org",
'class' => "high-traffic1",
- 'sites' => [ "pmtpa", "eqiad", "esams" ],
+ 'sites' => [ "pmtpa", "eqiad", "esams", "ulsfo" ],
'ip' => $service_ips['bits'][$::site],
'bgp' => "yes",
'depool-threshold' => ".5",
@@ -559,7 +543,7 @@
"upload" => {
'description' => "Images and other media,
upload.${::site}.wikimedia.org",
'class' => "high-traffic2",
- 'sites' => [ "pmtpa", "eqiad", "esams" ],
+ 'sites' => [ "pmtpa", "eqiad", "esams", "ulsfo" ],
'ip' => $service_ips['upload'][$::site],
'bgp' => "yes",
'depool-threshold' => ".5",
@@ -573,7 +557,7 @@
"mobile" => {
'description' => "MediaWiki based mobile site",
'class' => 'high-traffic1',
- 'sites' => [ 'eqiad', 'esams' ],
+ 'sites' => [ 'eqiad', 'esams', 'ulsfo' ],
'ip' => $service_ips['mobile'][$::site],
'bgp' => "yes",
'depool-threshold' => ".6",
diff --git a/manifests/site.pp b/manifests/site.pp
index 437411b..0430e85 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1674,15 +1674,12 @@
$lvs_balancer_ips = $::hostname ? {
/^lvs400[13]$/ => [
- $sip['text'][$::site],
$sip['text-varnish'][$::site],
$sip['bits'][$::site],
$sip['mobile'][$::site],
- $sip['ipv6'][$::site],
],
/^lvs[24]$/ => [
$sip['upload'][$::site],
- $sip['ipv6'][$::site],
]
}
--
To view, visit https://gerrit.wikimedia.org/r/86746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic03612e1761099f6b9f97c92c53143a5cd4f21d3
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Akosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@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
