BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/390059 )
Change subject: lvs4005-7: initial puppet setup
......................................................................
lvs4005-7: initial puppet setup
This puts them in the correct roles before their reinstall and
adds the correct router IPs to the config, but also explicitly
disables BGP and sets them all as secondaries in terms of
advertised MED, to avoid any kind of real-world impact until we're
ready to flip over to these.
Bug: T178436
Change-Id: Ic786cb2327b2d3e4580969eb7c2b9bdeecace448
---
M hieradata/regex.yaml
M manifests/site.pp
M modules/profile/manifests/pybal.pp
3 files changed, 9 insertions(+), 2 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index e4d18e4..fe80969 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -181,12 +181,17 @@
profile::pybal::primary: false
lvs_ulsfo_backup:
- __regex: !ruby/regexp /^lvs400[34]\.ulsfo\.wmnet$/
+ __regex: !ruby/regexp /^lvs400[34567]\.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
+
+lvs_temp_bgp_disable_lvs4:
+ __regex: !ruby/regexp /^lvs400[567]\.eqiad\.wmnet$/
+ profile::pybal::bgp: no
+
maps_test:
__regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
cassandra::target_version: '2.2'
diff --git a/manifests/site.pp b/manifests/site.pp
index c190c16..104ce86 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1522,7 +1522,7 @@
# ns override for all lvs for now, see T103921
$nameservers_override = [ '208.80.153.12', '208.80.153.42',
'208.80.154.254' ]
- role(spare::system)
+ role(lvs::balancer)
lvs::interface_tweaks {
'eth0': bnx2x => true, txqlen => 10000;
}
diff --git a/modules/profile/manifests/pybal.pp
b/modules/profile/manifests/pybal.pp
index 194332d..05784af 100644
--- a/modules/profile/manifests/pybal.pp
+++ b/modules/profile/manifests/pybal.pp
@@ -38,6 +38,8 @@
/^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)'
},
'bgp-nexthop-ipv4' => $facts['ipaddress'],
--
To view, visit https://gerrit.wikimedia.org/r/390059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic786cb2327b2d3e4580969eb7c2b9bdeecace448
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
