Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325278
Change subject: Send secondary DNS recursor IP from labs DHCP
......................................................................
Send secondary DNS recursor IP from labs DHCP
Bug: T137460
Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
---
M modules/openstack/manifests/nova/network.pp
M modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
M modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
3 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/325278/1
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 72aeacb..34442ba 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -38,6 +38,7 @@
$dnsconfig = hiera_hash('labsdnsconfig', {})
$labs_metal = hiera('labs_metal',{})
$recursor_ip = ipresolve($dnsconfig['recursor'],4)
+ $recursor_secondary_ip = ipresolve($dnsconfig['recursor_secondary'],4)
file { '/etc/dnsmasq-nova.conf':
content =>
template("openstack/${openstack_version}/nova/dnsmasq-nova.conf.erb"),
owner => 'root',
diff --git a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/liberty/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
<% end -%>
#Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%=
scope.function_ipresolve([@tftp_host, 4]) %>
diff --git a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
index 82f181f..1ba03a2 100644
--- a/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
+++ b/modules/openstack/templates/mitaka/nova/dnsmasq-nova.conf.erb
@@ -14,7 +14,7 @@
<% end -%>
#Clients should use the designate-backed dns server rather than dnsmasq
-dhcp-option=option:dns-server,<%= @recursor_ip %>
+dhcp-option=option:dns-server,<%= @recursor_ip %>,<%= @recursor_secondary_ip %>
dhcp-boot=jessie-installer/pxelinux.0,<%= @tftp_host -%>,<%=
scope.function_ipresolve([@tftp_host, 4]) %>
--
To view, visit https://gerrit.wikimedia.org/r/325278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c4942490776301d8fd1a2580e1b956f8c605105
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk <a...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
