Faidon Liambotis has submitted this change and it was merged.
Change subject: exim: Add and use $::other_site to provide LDAP fallback
......................................................................
exim: Add and use $::other_site to provide LDAP fallback
exim supports a list as an argument to the ldap_default_servers
argument. We use this to provide a fallback for when the DC-local corp
LDAP mirror fails. For this to work, we need a mapping though of DCs to
their fallbacks. Introduce the $other_site variable to provide this
functionality
Bug: T82662
Change-Id: I68d77bf4bf17dbf782a36aad382f13f601c7d50f
---
M manifests/realm.pp
M templates/exim/exim4.conf.mx.erb
2 files changed, 12 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 6cfbddf..dd5ae18 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -36,6 +36,16 @@
default => '(undefined)'
}
+# This is used to define the fallback site and is to be used by applications
that
+# are capable of automatically detecting a failed service and falling back to
+# another one. Only the 2 sites that make sense to really be here are added for
+# now
+$other_site = $site ? {
+ 'codfw' => 'eqiad',
+ 'eqiad' => 'codfw',
+ default => '(undefined)'
+}
+
$site_tier = $::realm ? {
production => $::site ? {
'eqiad' => 'one',
diff --git a/templates/exim/exim4.conf.mx.erb b/templates/exim/exim4.conf.mx.erb
index 4fc0618..34197e5 100644
--- a/templates/exim/exim4.conf.mx.erb
+++ b/templates/exim/exim4.conf.mx.erb
@@ -21,7 +21,8 @@
hide mysql_servers = m2-master.eqiad.wmnet/otrs/exim/<%= @otrs_mysql_password
%> : m2-slave.eqiad.wmnet/otrs/exim/<%= @otrs_mysql_password %>
# LDAP lookups (Office)
-ldap_default_servers = ldap-mirror.wikimedia.org
+# NOTE: temporarily keeping ldap-mirror.wikimedia.org until migration is
complete to ldap-corp.$::site
+ldap_default_servers = ldap-mirror.wikimedia.org : ldap-corp.<%= @site
%>.wikimedia.org : ldap-corp.<%= @other_site %>.wikimedia.org
LDAPPASSWORD=<%= @smtp_ldap_password %>
domainlist system_domains = @
--
To view, visit https://gerrit.wikimedia.org/r/249868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68d77bf4bf17dbf782a36aad382f13f601c7d50f
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
