BBlack has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/393610 )
Change subject: lvs400[1-4] to spare::system
......................................................................
lvs400[1-4] to spare::system
Bug: T178535
Change-Id: I36b0e7ac9e4b826e05acace5fefa5c936b6c1265
---
A hieradata/hosts/lvs4007.yaml
M hieradata/regex.yaml
M manifests/site.pp
M modules/lvs/manifests/configuration.pp
M modules/profile/manifests/pybal.pp
M modules/profile/templates/cumin/aliases.yaml.erb
6 files changed, 14 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/10/393610/1
diff --git a/hieradata/hosts/lvs4007.yaml b/hieradata/hosts/lvs4007.yaml
new file mode 100644
index 0000000..4dfa19f
--- /dev/null
+++ b/hieradata/hosts/lvs4007.yaml
@@ -0,0 +1 @@
+profile::pybal::primary: false
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index f846ec1..2934faf 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -170,10 +170,6 @@
__regex: !ruby/regexp /^lvs300[34]\.esams\.wmnet$/
profile::pybal::primary: false
-lvs_ulsfo_backup:
- __regex: !ruby/regexp /^lvs400[12347]\.ulsfo\.wmnet$/
- profile::pybal::primary: false
-
lvs_temp_bgp_disable:
__regex: !ruby/regexp /^lvs10(0[7-9]|1[0-2])\.eqiad\.wmnet$/
profile::pybal::bgp: no
diff --git a/manifests/site.pp b/manifests/site.pp
index 56dfd0e..68ba07b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1474,8 +1474,12 @@
}
}
-# ULSFO lvs servers
node /^lvs400[1-4]\.ulsfo\.wmnet$/ {
+ role(spare::system)
+}
+
+# ULSFO lvs servers
+node /^lvs400[567]\.ulsfo\.wmnet$/ {
# ns override for all lvs for now, see T103921
$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
@@ -1484,18 +1488,6 @@
'eth0': bnx2x => true, txqlen => 10000;
}
}
-
-# ULSFO new lvs servers set to spare until pushed into service via T178436
-node /^lvs400[5-7]\.ulsfo\.wmnet$/ {
- # ns override for all lvs for now, see T103921
- $nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
-
- role(lvs::balancer)
- lvs::interface_tweaks {
- 'eth0': bnx2x => true, txqlen => 10000;
- }
-}
-
node 'maerlant.wikimedia.org' {
role(dnsrecursor, ntp)
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index 418235e..8aa5b8a 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -8,7 +8,7 @@
'eqiad' => [ 'lvs1001', 'lvs1004', 'lvs1007', 'lvs1010' ],
'codfw' => [ 'lvs2001', 'lvs2004' ],
'esams' => [ 'lvs3001', 'lvs3003' ],
- 'ulsfo' => [ 'lvs4001', 'lvs4003', 'lvs4005', 'lvs4007' ],
+ 'ulsfo' => [ 'lvs4005', 'lvs4007' ],
default => undef,
},
'labs' => $::site ? {
@@ -21,7 +21,7 @@
'eqiad' => [ 'lvs1002', 'lvs1005', 'lvs1008', 'lvs1010' ],
'codfw' => [ 'lvs2002', 'lvs2005' ],
'esams' => [ 'lvs3002', 'lvs3004' ],
- 'ulsfo' => [ 'lvs4002', 'lvs4004', 'lvs4006', 'lvs4007' ],
+ 'ulsfo' => [ 'lvs4006', 'lvs4007' ],
default => undef,
},
'labs' => $::site ? {
@@ -54,9 +54,11 @@
/^lvs[12]00[14]$/ => 'high-traffic1',
/^lvs[12]00[25]$/ => 'high-traffic2',
/^lvs[12]00[36]$/ => 'low-traffic',
- /^lvs[34]00[135]$/ => 'high-traffic1',
- /^lvs[34]00[246]$/ => 'high-traffic2',
- /^lvs[34]007$/ => 'secondary',
+ /^lvs300[13]$/ => 'high-traffic1',
+ /^lvs300[24]$/ => 'high-traffic2',
+ 'lvs4005' => 'high-traffic1',
+ 'lvs4006' => 'high-traffic2',
+ 'lvs4007' => 'secondary',
default => 'unknown',
}
diff --git a/modules/profile/manifests/pybal.pp
b/modules/profile/manifests/pybal.pp
index 05784af..e1bfe49 100644
--- a/modules/profile/manifests/pybal.pp
+++ b/modules/profile/manifests/pybal.pp
@@ -36,8 +36,6 @@
/^lvs200[4-6]$/ => '208.80.153.193', # cr2-codfw
/^lvs300[12]$/ => '91.198.174.244', # cr2-esams
/^lvs300[34]$/ => '91.198.174.245', # cr1-esams
- /^lvs400[12]$/ => '198.35.26.192', # cr1-ulsfo
- /^lvs400[34]$/ => '198.35.26.193', # cr2-ulsfo
/^lvs400[56]$/ => '198.35.26.192', # cr1-ulsfo
'lvs4007' => '198.35.26.193', # cr2-ulsfo
default => '(unspecified)'
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index 28bc910..edcef5a 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -96,7 +96,7 @@
logstash: P{O:logstash::collector or O:logstash::elasticsearch}
logstash-canary: P{logstash1007.eqiad.wmnet}
lvs: P{O:lvs::balancer}
-lvs-canary: P{lvs4001.ulsfo.wmnet}
+lvs-canary: P{lvs4007.ulsfo.wmnet}
lvs-codfw: A:lvs and A:codfw
lvs-eqiad: A:lvs and A:eqiad
lvs-esams: A:lvs and A:esams
--
To view, visit https://gerrit.wikimedia.org/r/393610
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36b0e7ac9e4b826e05acace5fefa5c936b6c1265
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
