Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/255495
Change subject: Remove labs_ldap_dns_ip_override hiera setting
......................................................................
Remove labs_ldap_dns_ip_override hiera setting
I'm pretty sure this was only needed during transition; removing
should be a no-op.
Change-Id: I95f8f7848042967446caca63a2bf8df5e4ac3011
---
D hieradata/hosts/labcontrol1001.yaml
M manifests/role/dns.pp
2 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/255495/1
diff --git a/hieradata/hosts/labcontrol1001.yaml
b/hieradata/hosts/labcontrol1001.yaml
deleted file mode 100644
index 8a2b9ee..0000000
--- a/hieradata/hosts/labcontrol1001.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-labs_ldap_dns_ip_override: 208.80.154.94
-cluster: virt
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index be838d9..2baa971 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -5,11 +5,7 @@
$ldapconfig = $ldap::role::config::labs::ldapconfig
- if hiera('labs_ldap_dns_ip_override', undef) == undef {
- $primary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host'),4)
- } else {
- $primary_ldap_dns = hiera('labs_ldap_dns_ip_override')
- }
+ $primary_ldap_dns = ipresolve(hiera('labs_ldap_dns_host'),4)
interface::ip { 'role::dns::ldap':
interface => 'eth0',
--
To view, visit https://gerrit.wikimedia.org/r/255495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95f8f7848042967446caca63a2bf8df5e4ac3011
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
