From 0334bea82caeea90c02e7b3af5e472bbfe7449e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 26 Mar 2014 17:33:55 +0100 Subject: [PATCH] Add support of DNS server declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to declare some DNS servers for the virtual machines so they can resolve host names. Closes: #386 Signed-off-by: Sébastien Han --- examples/params.pp | 1 + manifests/network/dhcp.pp | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/examples/params.pp b/examples/params.pp index 28f3173e..bd6521f3 100644 --- a/examples/params.pp +++ b/examples/params.pp @@ -426,6 +426,7 @@ class os_params { $tunnel_eth = $internal_netif_ip $provider_vlan_ranges = ['physnet1:1000:2999'] $provider_bridge_mappings = ['physnet1:br-eth1'] + $dnsmasq_dns_servers = '8.8.8.8,8.8.4.4' # Nova $ks_nova_password = 'secrete' diff --git a/manifests/network/dhcp.pp b/manifests/network/dhcp.pp index 152de037..c136e982 100644 --- a/manifests/network/dhcp.pp +++ b/manifests/network/dhcp.pp @@ -17,8 +17,9 @@ # class cloud::network::dhcp( - $veth_mtu = 1500, - $debug = true + $veth_mtu = 1500, + $debug = true + $dnsmasq_dns_servers = false ) { include 'cloud::network' @@ -30,6 +31,7 @@ class cloud::network::dhcp( neutron_dhcp_agent_config { 'DEFAULT/dnsmasq_config_file': value => '/etc/neutron/dnsmasq-neutron.conf'; 'DEFAULT/enable_isolated_metadata': value => true; + 'DEFAULT/dnsmasq_dns_servers': value => $dnsmasq_dns_servers; } file { '/etc/neutron/dnsmasq-neutron.conf':