Andrew Bogott has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/398510 )
Change subject: labnet dnsmasq: use upstream dns servers ...................................................................... labnet dnsmasq: use upstream dns servers Dnsmasq only serves DNS for brand new pre-puppetized VMs; we want those VMs to be able to see the 'puppet' alias that's registered on our official DNS servers, so this patch tells dnsmasq about them. Bug: T181375 Change-Id: I4ca35f3355c4d8fb572865ed1096030c4257cfad --- M modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/398510/1 diff --git a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb index 1ba03a2..11b58ef 100644 --- a/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb +++ b/modules/openstack/templates/liberty/nova/network/dnsmasq-nova.conf.erb @@ -8,6 +8,10 @@ alias=<%= v['public_ip'] %>,<%= v['private_ip'] %> <% end -%> +# Use official (designate-managed) dns servers +server=<%= @recursor_ip %> +server=<%= @recursor_secondary_ip %> + # Special entries for labs baremetal <% @labs_metal.sort.map do |k,v| -%> dhcp-host=<%= v['MAC'] %>,<%= k %>,<%= v['IPv4'] %>,10m -- To view, visit https://gerrit.wikimedia.org/r/398510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ca35f3355c4d8fb572865ed1096030c4257cfad Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
