Remove deprecated options dhcp_domain & dhcp_delete_namespaces

- Remove dhcp_delete_namespaces as deprecated according to [0]
- Remove dhcp_domain as deprecated according to [1]
- Allow customization of dns_domain (which replaces dhcp_domain) option
in neutron.conf

[0] https://bugs.launchpad.net/neutron/+bug/1418079
[1] http://docs.openstack.org/liberty/config-reference/content/section_neutron-dhcp_agent.ini.html

Change-Id: Ic39632bd4b5a5cca2f8cc30527adf566f997bb96
This commit is contained in:
Jerzy Mikolajczak
2016-01-27 11:57:19 +01:00
parent 8ceda15976
commit 6dfbc869a8
4 changed files with 40 additions and 13 deletions

View File

@@ -19,8 +19,7 @@ describe 'neutron::agents::dhcp' do
:dhcp_driver => 'neutron.agent.linux.dhcp.Dnsmasq',
:root_helper => 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
:enable_isolated_metadata => false,
:enable_metadata_network => false,
:dhcp_delete_namespaces => true }
:enable_metadata_network => false }
end
let :test_facts do
@@ -46,7 +45,7 @@ describe 'neutron::agents::dhcp' do
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/root_helper').with_value(p[:root_helper]);
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/dhcp_delete_namespaces').with_value('<SERVICE DEFAULT>');
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>');
is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]);