Andrew Bogott has uploaded a new change for review. https://gerrit.wikimedia.org/r/186741
Change subject: Specify the DNS server for dnsmasq. ...................................................................... Specify the DNS server for dnsmasq. As per http://docs.openstack.org/admin-guide-cloud/content/section_dnsmasq.html, this can be explicitly set in the dns_server setting. It's not clear what was used previously as the default, but this may reduce the load on dnsmasq slightly. Change-Id: I9db7ad81194244568a37bade3b3c5fd702adf50d --- M manifests/role/nova.pp M modules/openstack/templates/icehouse/nova/nova.conf.erb 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/186741/1 diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp index f8f6b7f..afa26b8 100644 --- a/manifests/role/nova.pp +++ b/manifests/role/nova.pp @@ -63,6 +63,8 @@ default => $nova_controller_ip, } } + $primary_dns = $controller_address + $secondary_dns = '208.80.153.14' # That's labcontrol2001 $eqiadnovaconfig = { db_host => $controller_hostname, diff --git a/modules/openstack/templates/icehouse/nova/nova.conf.erb b/modules/openstack/templates/icehouse/nova/nova.conf.erb index d504972..0463ca7 100644 --- a/modules/openstack/templates/icehouse/nova/nova.conf.erb +++ b/modules/openstack/templates/icehouse/nova/nova.conf.erb @@ -93,6 +93,8 @@ vncserver_proxyclient_address=<%= novaconfig['my_ip'] %> dnsmasq_config_file=/etc/dnsmasq-nova.conf +dns_server=<%= novaconfig['primary_dns'] %> +dns_server=<%= novaconfig['secondary_dns'] %> # Settings for wikistatus, the plugin that updates OSM with instance status: notification_driver=wikistatus -- To view, visit https://gerrit.wikimedia.org/r/186741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9db7ad81194244568a37bade3b3c5fd702adf50d 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
