Faidon Liambotis has submitted this change and it was merged.
Change subject: Assign wiki-mail-codfw to mx2001
......................................................................
Assign wiki-mail-codfw to mx2001
...and use it across the fleet. wiki-mail-eqiad's counterpart.
Change-Id: Ie9e9399646f58e297639545c3ee330b117eb882c
---
M manifests/realm.pp
M manifests/site.pp
2 files changed, 17 insertions(+), 1 deletion(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 8d45c63..dd27faa 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -176,7 +176,11 @@
# Route list for mail coming from MediaWiki mailer
$wikimail_smarthost = $::realm ? {
- 'production' => [ 'wiki-mail-eqiad.wikimedia.org' ],
+ 'production' => $::site ? {
+ 'eqiad' => [ 'wiki-mail-eqiad.wikimedia.org',
'wiki-mail-codfw.wikimedia.org' ],
+ 'codfw' => [ 'wiki-mail-codfw.wikimedia.org',
'wiki-mail-eqiad.wikimedia.org' ],
+ default => [ 'wiki-mail-eqiad.wikimedia.org',
'wiki-mail-codfw.wikimedia.org' ],
+ },
'labs' => $::labsproject ? {
'deployment-prep' => [ 'deployment-mx.eqiad.wmflabs' ],
default => [ 'mx1001.wikimedia.org', 'mx2001.wikimedia.org'
],
diff --git a/manifests/site.pp b/manifests/site.pp
index b35d04c..ecd4e01 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2149,6 +2149,18 @@
include standard
include base::firewall
interface::add_ip6_mapped { 'main': }
+
+ interface::ip { 'wiki-mail-codfw.wikimedia.org_v4':
+ interface => 'eth0',
+ address => '208.80.153.46',
+ prefixlen => '32',
+ }
+
+ interface::ip { 'wiki-mail-codfw.wikimedia.org_v6':
+ interface => 'eth0',
+ address => '2620:0:860:2:208:80:153:46',
+ prefixlen => '128',
+ }
}
# Codfw ldap server, aka ldap-codfw
--
To view, visit https://gerrit.wikimedia.org/r/240348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9e9399646f58e297639545c3ee330b117eb882c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
