Andrew Bogott has submitted this change and it was merged.
Change subject: Remove use_dnsmasq logic.
......................................................................
Remove use_dnsmasq logic.
Now everything should just use the new labs recursor.
Change-Id: I3b3358e6e5cacf47231826900154b73c3230b200
---
M manifests/realm.pp
M modules/base/manifests/resolving.pp
M modules/base/templates/resolv.conf.labs.erb
M modules/openstack/templates/icehouse/designate/designate.conf.erb
4 files changed, 4 insertions(+), 12 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Yuvipanda: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 9069ceb..08f9c0e 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -52,7 +52,7 @@
# DNS
if $::realm == 'labs' {
- $nameservers = [ '10.68.16.1' ]
+ $nameservers = [ ipresolve(hiera('labs_recursor'),4) ]
} else {
$nameservers = $site ? {
'eqiad' => [ '208.80.154.239', '208.80.153.254' ], # eqiad -> eqiad,
codfw
diff --git a/modules/base/manifests/resolving.pp
b/modules/base/manifests/resolving.pp
index 4299182..01ab3eb 100644
--- a/modules/base/manifests/resolving.pp
+++ b/modules/base/manifests/resolving.pp
@@ -27,8 +27,6 @@
require => File['/etc/dhcp/dhclient-enter-hooks.d'],
}
- $use_dnsmasq_server = hiera('use_dnsmasq', $::use_dnsmasq)
- $labs_recursor = ipresolve(hiera('labs_recursor'),4)
# 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 3d13c29..fd04381 100644
--- a/modules/base/templates/resolv.conf.labs.erb
+++ b/modules/base/templates/resolv.conf.labs.erb
@@ -3,15 +3,9 @@
## source: modules/base/resolv.conf.labs.erb
## from: base::resolving
-<% if @use_dnsmasq_server == true then -%>
-domain <%= @site %>.wmflabs
-search <%= @site %>.wmflabs labs.<%= @site %>.wmnet
-<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
-nameserver <%= nsip %>
-<% end -%>
-<% else -%>
domain <%= @instanceproject %>.<%= @site %>.wmflabs
search <%= @instanceproject %>.<%= @site %>.wmflabs <%= @site %>.wmflabs
-nameserver <%= @labs_recursor %>
+<% scope.lookupvar('::nameservers').sort.each do |nsip| -%>
+nameserver <%= nsip %>
<% end -%>
options timeout:5 ndots:2
diff --git a/modules/openstack/templates/icehouse/designate/designate.conf.erb
b/modules/openstack/templates/icehouse/designate/designate.conf.erb
index a9d09f0..b28ea1b 100644
--- a/modules/openstack/templates/icehouse/designate/designate.conf.erb
+++ b/modules/openstack/templates/icehouse/designate/designate.conf.erb
@@ -224,7 +224,7 @@
ldapusername = uid=novaadmin,ou=people,dc=wikimedia,dc=org
ldappassword = <%= @ldap_user_pass %>
puppetdefaultclasses = base, role::labs::instance
-puppetdefaultvars = realm=labs, use_dnsmasq=true
+puppetdefaultvars = realm=labs
certmanager_user = certmanager
puppet_key_format = '%(hostname)s.%(tenant_id)s.%(domain)s'
--
To view, visit https://gerrit.wikimedia.org/r/216673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b3358e6e5cacf47231826900154b73c3230b200
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
