Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/202361
Change subject: Revert "base: Allow hiera to override ldap use_dnsmasq variable"
......................................................................
Revert "base: Allow hiera to override ldap use_dnsmasq variable"
This reverts commit 11427d9fc559f03bbd27b8f10aa2e0722e3ceb52.
Change-Id: I6dee926d12fcfa086bede10b54600ee621153119
---
M modules/base/manifests/resolving.pp
M modules/base/templates/resolv.conf.labs.erb
2 files changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/202361/1
diff --git a/modules/base/manifests/resolving.pp
b/modules/base/manifests/resolving.pp
index 6b04a62..01ab3eb 100644
--- a/modules/base/manifests/resolving.pp
+++ b/modules/base/manifests/resolving.pp
@@ -27,7 +27,6 @@
require => File['/etc/dhcp/dhclient-enter-hooks.d'],
}
- $use_dnsmasq_server = hiera('use_dnsmasq', $::use_dnsmasq)
# Now, finally, we can just puppetize the damn file
file { '/etc/resolv.conf':
owner => 'root',
diff --git a/modules/base/templates/resolv.conf.labs.erb
b/modules/base/templates/resolv.conf.labs.erb
index fc28f91..b26ecb0 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -3,7 +3,7 @@
## source: modules/base/resolv.conf.labs.erb
## from: base::resolving
-<% if @use_dnsmasq_server == true then -%>
+<% if @use_dnsmasq == true then -%>
domain <%= @site %>.wmflabs
search <%= @site %>.wmflabs labs.<%= @site %>.wmnet
nameserver 10.68.16.1
--
To view, visit https://gerrit.wikimedia.org/r/202361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dee926d12fcfa086bede10b54600ee621153119
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
