Mark Bergsma has submitted this change and it was merged.
Change subject: Add new esams LVS service IPs
......................................................................
Add new esams LVS service IPs
text-varnish needs the IPs to point at the Varnish cluster.
protoproxy.pp will accept the new IPs, but send them to the
regular internal textsvc IP, which is Squid for now.
Change-Id: I8ba83bcf5ad2fa34a12b2a9e6ba2f4574ce9fe6c
---
M manifests/lvs.pp
M manifests/role/protoproxy.pp
2 files changed, 12 insertions(+), 2 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/lvs.pp b/manifests/lvs.pp
index 293ed9a..ccd5945 100644
--- a/manifests/lvs.pp
+++ b/manifests/lvs.pp
@@ -164,7 +164,13 @@
'wikidatalb' => '208.80.154.242',
'wikivoyagelb' => "208.80.154.243"
},
- 'esams' => {},
+ 'esams' => {
+ 'textlb' => '91.198.174.192',
+ 'loginlb' => '91.198.174.201',
+
+ #'textlb6' => '2620:0:862:ed1a::1',
+ 'loginlb6' => '2620:0:862:ed1a::1:9',
+ },
'ulsfo' => {
'textlb' => '198.35.26.96',
'loginlb' => '198.35.26.105',
@@ -239,6 +245,8 @@
'wikivoyagelbsecure6' =>
"2620:0:861:ed1a::13"
},
'esams' => {
+ 'textlbsecure' => '91.198.174.192',
+ 'loginlbsecure' => '91.198.174.201',
'wikimedialbsecure' => "91.198.174.224",
'wikipedialbsecure' => "91.198.174.225",
'bitslbsecure' => "91.198.174.233",
@@ -256,6 +264,8 @@
'wikidatalbsecure' => '91.198.174.237',
'wikivoyagelbsecure' =>
'91.198.174.238',
+ #'textlb6secure' =>
'2620:0:862:ed1a::1',
+ 'loginlbsecure6' =>
'2620:0:862:ed1a::1:9',
'wikimedialbsecure6' =>
"2620:0:862:ed1a::0",
'wikipedialbsecure6' =>
"2620:0:862:ed1a::1",
'wiktionarylbsecure6' =>
"2620:0:862:ed1a::2",
diff --git a/manifests/role/protoproxy.pp b/manifests/role/protoproxy.pp
index 20a87ef..871369c 100644
--- a/manifests/role/protoproxy.pp
+++ b/manifests/role/protoproxy.pp
@@ -82,7 +82,7 @@
proxy_addresses => {
'pmtpa' => [ '208.80.152.200', '[2620:0:860:ed1a::]' ],
'eqiad' => [ '208.80.154.224', '[2620:0:861:ed1a::]' ],
- 'esams' => [ '91.198.174.224', '[2620:0:862:ed1a::]' ],
+ 'esams' => [ '91.198.174.192', '91.198.174.201', '91.198.174.224',
'[2620:0:862:ed1a::]', '[2620:0:862:ed1a::1:9]' ],
},
proxy_server_name => '*.wikimedia.org',
proxy_server_cert_name => 'unified.wikimedia.org',
--
To view, visit https://gerrit.wikimedia.org/r/93717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ba83bcf5ad2fa34a12b2a9e6ba2f4574ce9fe6c
Gerrit-PatchSet: 1
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
