openstack/puppet-neutron
Code Issues Proposed changes

Merge "Allow customization of dhcp_domain setting from agents/dhcp.pp"

Browse Source
This commit is contained in:
Jenkins 2015-06-18 08:14:21 +00:00 committed by Gerrit Code Review
commit e2fb846dfe
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/agents/dhcp.pp
View File

@ -29,6 +29,10 @@
# [*interface_driver*] # [*interface_driver*]
# (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'. # (optional) Defaults to 'neutron.agent.linux.interface.OVSInterfaceDriver'.
# #
# [*dhcp_domain*]
# (optional) domain to use for building the hostnames
# Defaults to 'openstacklocal'
#
# [*dhcp_driver*] # [*dhcp_driver*]
# (optional) Defaults to 'neutron.agent.linux.dhcp.Dnsmasq'. # (optional) Defaults to 'neutron.agent.linux.dhcp.Dnsmasq'.
# #
@ -69,6 +73,7 @@ class neutron::agents::dhcp (
$state_path = '/var/lib/neutron', $state_path = '/var/lib/neutron',
$resync_interval = 30, $resync_interval = 30,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$dhcp_domain = 'openstacklocal',
$dhcp_driver = 'neutron.agent.linux.dhcp.Dnsmasq', $dhcp_driver = 'neutron.agent.linux.dhcp.Dnsmasq',
$root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf', $root_helper = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
$use_namespaces = true, $use_namespaces = true,
@ -113,6 +118,7 @@ class neutron::agents::dhcp (
'DEFAULT/state_path': value => $state_path; 'DEFAULT/state_path': value => $state_path;
'DEFAULT/resync_interval': value => $resync_interval; 'DEFAULT/resync_interval': value => $resync_interval;
'DEFAULT/interface_driver': value => $interface_driver; 'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/dhcp_domain': value => $dhcp_domain;
'DEFAULT/dhcp_driver': value => $dhcp_driver; 'DEFAULT/dhcp_driver': value => $dhcp_driver;
'DEFAULT/use_namespaces': value => $use_namespaces; 'DEFAULT/use_namespaces': value => $use_namespaces;
'DEFAULT/root_helper': value => $root_helper; 'DEFAULT/root_helper': value => $root_helper;

2
spec/classes/neutron_agents_dhcp_spec.rb
View File

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