From f20d682fa1e478e4a7f42c866136c7a772c6d5ae Mon Sep 17 00:00:00 2001 From: slava Date: Fri, 8 Jul 2016 01:07:57 +0300 Subject: [PATCH] Bind dnsmasq to ip address instead of iface name Change-Id: I49d1d6b50f43332ddfb9b86bb9b2b22d75e5c3e6 Closes-Bug: #1600030 (cherry picked from commit d806feb629ff671538fe99a96019ad7a544a94e1) --- deployment/puppet/cobbler/manifests/init.pp | 4 ++-- deployment/puppet/cobbler/spec/classes/cobbler_spec.rb | 2 +- deployment/puppet/cobbler/templates/dnsmasq.template.erb | 2 +- deployment/puppet/fuel/examples/cobbler.pp | 2 +- deployment/puppet/fuel/manifests/cobbler.pp | 4 ++-- deployment/puppet/fuel/manifests/params.pp | 2 +- tests/noop/spec/hosts/master/cobbler_spec.rb | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/deployment/puppet/cobbler/manifests/init.pp b/deployment/puppet/cobbler/manifests/init.pp index d8598ba9f7..78e7e0882a 100644 --- a/deployment/puppet/cobbler/manifests/init.pp +++ b/deployment/puppet/cobbler/manifests/init.pp @@ -30,7 +30,7 @@ # [dhcp_end_address] Last address of dhcp range # [dhcp_netmask] Netmask of the network # [dhcp_gateway] Gateway address for installed nodes -# [dhcp_interface] Interface where to bind dhcp and tftp services +# [dhcp_ipaddress] IP address where to bind dhcp and tftp services # # [cobbler_user] Cobbler web interface username # [cobbler_password] Cobbler web interface password @@ -54,7 +54,7 @@ class cobbler( $dhcp_end_address = '10.0.0.254', $dhcp_netmask = '255.255.255.0', $dhcp_gateway = $ipaddress, - $dhcp_interface = 'eth0', + $dhcp_ipaddress = '127.0.0.1', $cobbler_user = 'cobbler', $cobbler_password = 'cobbler', diff --git a/deployment/puppet/cobbler/spec/classes/cobbler_spec.rb b/deployment/puppet/cobbler/spec/classes/cobbler_spec.rb index 48102a0944..a82743fbed 100644 --- a/deployment/puppet/cobbler/spec/classes/cobbler_spec.rb +++ b/deployment/puppet/cobbler/spec/classes/cobbler_spec.rb @@ -15,7 +15,7 @@ describe 'cobbler' do :dhcp_end_address => '10.0.0.254', :dhcp_netmask => '255.255.255.0', :dhcp_gateway => facts[:ipaddress], - :dhcp_interface => 'eth0', + :dhcp_ipaddress => facts[:ipaddress], :cobbler_user => 'cobbler', :cobbler_password => 'cobbler', :pxetimeout => 0, diff --git a/deployment/puppet/cobbler/templates/dnsmasq.template.erb b/deployment/puppet/cobbler/templates/dnsmasq.template.erb index d70f8dea35..219b5a2c4c 100644 --- a/deployment/puppet/cobbler/templates/dnsmasq.template.erb +++ b/deployment/puppet/cobbler/templates/dnsmasq.template.erb @@ -17,7 +17,7 @@ server=/<%= @dns_domain %>/ server=/<%= @dns_domain %>/<%= dns %> <%- end -%> resolv-file=/etc/dnsmasq.upstream -interface=<%= @dhcp_interface %> +listen-address=<%= @dhcp_ipaddress %> # On systems which support it, dnsmasq binds the wildcard address, # even when it is listening on only some interfaces. It then discards diff --git a/deployment/puppet/fuel/examples/cobbler.pp b/deployment/puppet/fuel/examples/cobbler.pp index 1074d47398..c445423988 100644 --- a/deployment/puppet/fuel/examples/cobbler.pp +++ b/deployment/puppet/fuel/examples/cobbler.pp @@ -31,7 +31,7 @@ class { '::fuel::cobbler': dns_upstream => $::fuel_settings['DNS_UPSTREAM'], dns_domain => $::fuel_settings['DNS_DOMAIN'], dns_search => $::fuel_settings['DNS_SEARCH'], - dhcp_interface => $::fuel_settings['ADMIN_NETWORK']['interface'], + dhcp_ipaddress => $::fuel_settings['ADMIN_NETWORK']['ipaddress'], nailgun_api_url => $nailgun_api_url, bootstrap_ethdevice_timeout => $bootstrap_ethdevice_timeout, } diff --git a/deployment/puppet/fuel/manifests/cobbler.pp b/deployment/puppet/fuel/manifests/cobbler.pp index b4037335eb..d041c40f55 100644 --- a/deployment/puppet/fuel/manifests/cobbler.pp +++ b/deployment/puppet/fuel/manifests/cobbler.pp @@ -17,7 +17,7 @@ class fuel::cobbler( $dns_search = $::fuel::params::dns_search, $mco_user = $::fuel::params::mco_user, $mco_pass = $::fuel::params::mco_password, - $dhcp_interface = $::fuel::params::dhcp_interface, + $dhcp_ipaddress = $::fuel::params::dhcp_ipaddress, $nailgun_api_url = "http://${::fuel::params::nailgun_host}:${::fuel::params::nailgun_port}/api", # default password is 'r00tme' $ks_encrypted_root_password = $::fuel::params::ks_encrypted_root_password, @@ -59,7 +59,7 @@ class fuel::cobbler( # dhcp_end_address => $dhcp_end_address, # dhcp_netmask => $dhcp_netmask, # dhcp_gateway => $dhcp_gateway, - dhcp_interface => $dhcp_interface, + dhcp_ipaddress => $dhcp_ipaddress, cobbler_user => $cobbler_user, cobbler_password => $cobbler_password, pxetimeout => '50' diff --git a/deployment/puppet/fuel/manifests/params.pp b/deployment/puppet/fuel/manifests/params.pp index 90299ca742..a1413e9f2f 100644 --- a/deployment/puppet/fuel/manifests/params.pp +++ b/deployment/puppet/fuel/manifests/params.pp @@ -64,7 +64,7 @@ class fuel::params { $dns_upstream = '8.8.8.8' $dns_domain = 'domain.tld' $dns_search = 'domain.tld' - $dhcp_interface = 'eth0' + $dhcp_ipaddress = '127.0.0.1' $admin_interface = 'eth0' $admin_network = '10.20.0.*' $extra_networks = undef diff --git a/tests/noop/spec/hosts/master/cobbler_spec.rb b/tests/noop/spec/hosts/master/cobbler_spec.rb index 0a4e7573a0..3dac911084 100644 --- a/tests/noop/spec/hosts/master/cobbler_spec.rb +++ b/tests/noop/spec/hosts/master/cobbler_spec.rb @@ -30,7 +30,7 @@ describe manifest do :dns_upstream => fuel_settings['DNS_UPSTREAM'], :dns_domain => fuel_settings['DNS_DOMAIN'], :dns_search => fuel_settings['DNS_SEARCH'], - :dhcp_interface => fuel_settings['ADMIN_NETWORK']['interface'], + :dhcp_ipaddress => fuel_settings['ADMIN_NETWORK']['ipaddress'], :nailgun_api_url => "http://#{fuel_settings['ADMIN_NETWORK']['ipaddress']}:8000/api", :bootstrap_ethdevice_timeout => bootstrap_settings.fetch('ethdevice_timeout', '120'), }