Andrew Bogott has submitted this change and it was merged.
Change subject: Removed use of labs_ldap_dns_host_secondary in 'local-address'.
......................................................................
Removed use of labs_ldap_dns_host_secondary in 'local-address'.
As far as I can tell, this was just a long-standing mistake. It
doesn't make sense to set the IP of another system in another
datacenter as a listen address. I can't imagine why this
ever worked in the past.
Change-Id: Ia73d53347a9551aa9ef3931effad641db7d8c7f5
---
M manifests/role/dns.pp
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index b73e12a..4b50f3a 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -6,7 +6,6 @@
$ldapconfig = $ldap::role::config::labs::ldapconfig
$primary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host'),4)
- $secondary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host_secondary'),4)
interface::ip { 'role::dns::ldap':
interface => 'eth0',
@@ -15,7 +14,7 @@
# FIXME: turn these settings into a hash that can be included somewhere
class { '::labs_ldap_dns':
- dns_auth_ipaddress => "${primary_ldap_dns} ${secondary_ldap_dns}",
+ dns_auth_ipaddress => $primary_ldap_dns,
dns_auth_query_address => $primary_ldap_dns,
dns_auth_soa_name => hiera('labs_ldap_dns_host'),
ldap_hosts => $ldapconfig['servernames'],
--
To view, visit https://gerrit.wikimedia.org/r/214412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia73d53347a9551aa9ef3931effad641db7d8c7f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
