openstack/puppet-neutron
Code Issues Proposed changes

dhcp: don't override default dhcp_driver value

Browse Source 
Dnsmasq driver is already the default for neutron. Actually, the option
is a historic curiosity, and upstream team does not think about the
agent as pluggable. The chance is high pluggability is not working at
all.

Change-Id: I85aa3693a37611ead505a9a30c10907e5dae2211
This commit is contained in:
Ihar Hrachyshka
2016-12-03 02:59:28 +00:00
parent 6efb7fc488
commit 2430d11252
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/dhcp.pp
View File

@@ -30,7 +30,7 @@
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
#
# [*dhcp_driver*]
# (optional) Defaults to 'neutron.agent.linux.dhcp.Dnsmasq'.
# (optional) Defaults to $::os_service_default.
#
# [*root_helper*]
# (optional) Defaults to 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf'.
@@ -88,7 +88,7 @@ class neutron::agents::dhcp (
$state_path = '/var/lib/neutron',
$resync_interval = 30,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$dhcp_driver = 'neutron.agent.linux.dhcp.Dnsmasq',
$dhcp_driver = $::os_service_default,
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$dnsmasq_config_file = $::os_service_default,
$dnsmasq_dns_servers = $::os_service_default,

3
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -16,7 +16,6 @@ describe 'neutron::agents::dhcp' do
:state_path => '/var/lib/neutron',
:resync_interval => 30,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:dhcp_driver => 'neutron.agent.linux.dhcp.Dnsmasq',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:enable_isolated_metadata => false,
:enable_metadata_network => false,
@@ -42,7 +41,7 @@ describe 'neutron::agents::dhcp' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/resync_interval').with_value(p[:resync_interval]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value('<SERVICE DEFAULT>');
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value(p[:dhcp_driver]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_driver').with_value('<SERVICE DEFAULT>');
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/root_helper').with_value(p[:root_helper]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_isolated_metadata').with_value(p[:enable_isolated_metadata]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/force_metadata').with_value('<SERVICE DEFAULT>');