Mark Bergsma has submitted this change and it was merged.
Change subject: Add new bits-lb IPs (new Zero scheme)
......................................................................
Add new bits-lb IPs (new Zero scheme)
Change-Id: Ib955ffed21f24d3caf3b2c726a4a0aecfb9cd3d1
---
M manifests/lvs.pp
M manifests/role/protoproxy.pp
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index a529fac..a8129e4 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -223,9 +223,9 @@
},
'bits' => {
'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" },
+ 'eqiad' => { 'bitslb' => "208.80.154.234",
'bitslb6-new' => '2620:0:861:ed1a::1:a', 'bitslb6' => "2620:0:861:ed1a::a",
'bitssvc' => "10.2.2.23" },
+ 'esams' => { 'bitslb-new' => '91.198.174.202',
'bitslb' => "91.198.174.233", 'bitslb6-new' => '2620:0:862:ed1a::1:a',
'bitslb6' => "2620:0:862:ed1a::a", 'bitssvc' => "10.2.3.23" },
+ 'ulsfo' => { 'bitslb' => "198.35.26.106",
'bitslb6-new' => '2620:0:863:ed1a::1:a', '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/protoproxy.pp b/manifests/role/protoproxy.pp
index b04d815..d6fb5ea 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -97,8 +97,8 @@
protoproxy{ 'bits':
proxy_addresses => {
'pmtpa' => [ '208.80.152.210', '[2620:0:860:ed1a::a]' ],
- 'eqiad' => [ '208.80.154.234', '[2620:0:861:ed1a::a]' ],
- 'esams' => [ '91.198.174.233', '[2620:0:862:ed1a::a]' ],
+ 'eqiad' => [ '208.80.154.234', '[2620:0:861:ed1a::1:a]',
'[2620:0:861:ed1a::a]' ],
+ 'esams' => [ '91.198.174.202', '91.198.174.233',
'[2620:0:862:ed1a::1:a]', '[2620:0:862:ed1a::a]' ],
},
proxy_server_name => 'bits.wikimedia.org geoiplookup.wikimedia.org',
proxy_server_cert_name => 'unified.wikimedia.org',
@@ -113,7 +113,7 @@
protoproxy{ 'upload':
proxy_addresses => {
'pmtpa' => [ '208.80.152.211', '[2620:0:860:ed1a::b]' ],
- 'eqiad' => [ '208.80.154.240', '208.80.154.235',
'[2620:0:861:ed1a::2:b]', '[2620:0:861:ed1a::b]' ],
+ 'eqiad' => [ '208.80.154.240', '[2620:0:861:ed1a::2:b]' ],
'esams' => [ '91.198.174.208', '[2620:0:862:ed1a::2:b]' ],
},
proxy_server_name => 'upload.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/102432
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib955ffed21f24d3caf3b2c726a4a0aecfb9cd3d1
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <[email protected]>
Gerrit-Reviewer: Mark Bergsma <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
