openstack/puppet-neutron
Code Issues Proposed changes

Allow customization of dhcp_domain setting from agents/dhcp.pp

Browse Source 
With this patch we aim at making the dhcp_domain setting
customizable from the agents/dhcp class.

Change-Id: I457ae90cb8de500998e9d4775f2832747d052628
This commit is contained in:
Giulio Fidente
2015-06-14 10:18:41 +02:00
parent 048212b1b1
commit 5044f27823
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -17,6 +17,7 @@ describe 'neutron::agents::dhcp' do
:state_path => '/var/lib/neutron',
:resync_interval => 30,
:interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver',
:dhcp_domain => 'openstacklocal',
:dhcp_driver => 'neutron.agent.linux.dhcp.Dnsmasq',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:use_namespaces => true,
@@ -41,6 +42,7 @@ describe 'neutron::agents::dhcp' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/state_path').with_value(p[:state_path]);
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(p[:dhcp_domain]);
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/root_helper').with_value(p[:root_helper]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces]);