openstack/puppet-neutron
Code Issues Proposed changes

Unset deprecated parameter use_namespaces by default

Browse Source 
The option use_namespaces is deprecated and will be removed in a future release
The old behavior of use_namespaces = True will be enforced, hence setting it to
undef by default

Change-Id: I73ff929e40e6ed42247e6145202181067b6e28ed
This commit is contained in:
Sergey Kolekonov
2015-07-29 17:51:44 +03:00
parent 774470c8bb
commit 0a9eddaf02
8 changed files with 121 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spec/classes/neutron_agents_dhcp_spec.rb
View File

@@ -20,7 +20,7 @@ describe 'neutron::agents::dhcp' do
:dhcp_domain => 'openstacklocal',
:dhcp_driver => 'neutron.agent.linux.dhcp.Dnsmasq',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:use_namespaces => true,
:use_namespaces => nil,
:dnsmasq_config_file => nil,
:dhcp_delete_namespaces => false,
:enable_isolated_metadata => false,
@@ -51,7 +51,6 @@ describe 'neutron::agents::dhcp' do
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]);
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]);
@@ -119,6 +118,15 @@ describe 'neutron::agents::dhcp' do
it_raises 'a Puppet::Error', /enable_metadata_network to true requires enable_isolated_metadata also enabled./
end
context 'with use_namespaces as false' do
before :each do
params.merge!(:use_namespaces => false)
end
it 'should set use_namespaces option' do
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/use_namespaces').with_value(p[:use_namespaces])
end
end
end
shared_examples_for 'neutron dhcp agent with dnsmasq_config_file specified' do