openstack/puppet-neutron
Code Issues Proposed changes

Merge "Allow neutron-dhcp-agent broadcast reply."

Browse Source
This commit is contained in:
Jenkins 2015-07-30 11:07:48 +00:00 committed by Gerrit Code Review
commit d937539a4b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/agents/dhcp.pp
View File

@ -80,7 +80,8 @@ class neutron::agents::dhcp (
$dnsmasq_config_file = undef,
$dhcp_delete_namespaces = false,
$enable_isolated_metadata = false,
$enable_metadata_network = false
$enable_metadata_network = false,
$dhcp_broadcast_reply = false
) {
include ::neutron::params
@ -123,6 +124,7 @@ class neutron::agents::dhcp (
'DEFAULT/use_namespaces': value => $use_namespaces;
'DEFAULT/root_helper': value => $root_helper;
'DEFAULT/dhcp_delete_namespaces': value => $dhcp_delete_namespaces;
'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply;
}
if $dnsmasq_config_file {

4
spec/classes/neutron_agents_dhcp_spec.rb
View File

@ -24,7 +24,8 @@ describe 'neutron::agents::dhcp' do
:dnsmasq_config_file => nil,
:dhcp_delete_namespaces => false,
:enable_isolated_metadata => false,
:enable_metadata_network => false }
:enable_metadata_network => false,
:dhcp_broadcast_reply => false }
end
let :default_facts do
@ -54,6 +55,7 @@ describe 'neutron::agents::dhcp' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_delete_namespaces').with_value(p[:dhcp_delete_namespaces]);
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/enable_metadata_network').with_value(p[:enable_metadata_network]);
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_broadcast_reply').with_value(p[:dhcp_broadcast_reply]);
end
it 'installs neutron dhcp agent package' do