From 4d6acf4bab063c1cc82c101e3fedd774a113b2ea Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 5 Feb 2016 13:26:24 +0300 Subject: [PATCH] Deprecate router[dhcp]_delete_namespaces parameter router_delete_namespaces and dhcp_delete_namespaces parameters were removed in Mitaka. See I2a879213c3b095a007a4531f430a33cea9fdf1bd Change-Id: I6e3077e0e490323832949bc45474e10af414994e --- manifests/agents/dhcp.pp | 3 +-- manifests/agents/l3.pp | 15 +++++++++------ spec/classes/neutron_agents_dhcp_spec.rb | 1 - spec/classes/neutron_agents_l3_spec.rb | 2 -- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp index fa9198b4e..7a3bc6dab 100644 --- a/manifests/agents/dhcp.pp +++ b/manifests/agents/dhcp.pp @@ -136,13 +136,12 @@ class neutron::agents::dhcp ( 'DEFAULT/dhcp_domain': value => $dhcp_domain; 'DEFAULT/dhcp_driver': value => $dhcp_driver; 'DEFAULT/root_helper': value => $root_helper; - 'DEFAULT/dhcp_delete_namespaces': value => $dhcp_delete_namespaces; 'DEFAULT/dhcp_broadcast_reply': value => $dhcp_broadcast_reply; 'DEFAULT/dnsmasq_config_file': value => $dnsmasq_config_file; } if ! is_service_default ($dhcp_delete_namespaces) { - warning('The dhcp_delete_namespaces parameter is deprecated and will be removed in future releases') + warning('The dhcp_delete_namespaces parameter was removed in Mitaka, it does not take any affect') } if ! is_service_default ($dhcp_domain) { diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp index 898c00a5e..8fd561459 100644 --- a/manifests/agents/l3.pp +++ b/manifests/agents/l3.pp @@ -64,10 +64,6 @@ # Defaults to $::os_service_default # Should be deprecated in the next major release in favor of a global parameter # -# [*router_delete_namespaces*] -# (optional) namespaces can be deleted cleanly on the host running the L3 agent -# Defaults to true -# # [*ha_enabled*] # (optional) Enabled or not HA for L3 agent. # Defaults to false @@ -106,6 +102,10 @@ # (optional) Deprecated. The name of the external bridge # Defaults to $::os_service_default # +# [*router_delete_namespaces*] +# (optional) Deprecated. Namespaces can be deleted cleanly on the host running the L3 agent +# Defaults to ::os_service_default +# class neutron::agents::l3 ( $package_ensure = 'present', $enabled = true, @@ -121,7 +121,6 @@ class neutron::agents::l3 ( $periodic_fuzzy_delay = $::os_service_default, $enable_metadata_proxy = $::os_service_default, $network_device_mtu = $::os_service_default, - $router_delete_namespaces = true, $ha_enabled = false, $ha_vrrp_auth_type = 'PASS', $ha_vrrp_auth_password = $::os_service_default, @@ -131,6 +130,7 @@ class neutron::agents::l3 ( $allow_automatic_l3agent_failover = false, $use_namespaces = $::os_service_default, $external_network_bridge = $::os_service_default, + $router_delete_namespaces = $::os_service_default, ) { include ::neutron::params @@ -146,6 +146,10 @@ class neutron::agents::l3 ( warning('parameter external_network_bridge is deprecated') } + if ! is_service_default ($router_delete_namespaces) { + warning('parameter router_delete_namespaces was removed in Mitaka, it does not take any affect') + } + if $ha_enabled { neutron_l3_agent_config { 'DEFAULT/ha_vrrp_auth_type': value => $ha_vrrp_auth_type; @@ -166,7 +170,6 @@ class neutron::agents::l3 ( 'DEFAULT/periodic_interval': value => $periodic_interval; 'DEFAULT/periodic_fuzzy_delay': value => $periodic_fuzzy_delay; 'DEFAULT/enable_metadata_proxy': value => $enable_metadata_proxy; - 'DEFAULT/router_delete_namespaces': value => $router_delete_namespaces; 'DEFAULT/agent_mode': value => $agent_mode; 'DEFAULT/network_device_mtu': value => $network_device_mtu; 'DEFAULT/use_namespaces': value => $use_namespaces; diff --git a/spec/classes/neutron_agents_dhcp_spec.rb b/spec/classes/neutron_agents_dhcp_spec.rb index dd8381c57..0d4f0f54e 100644 --- a/spec/classes/neutron_agents_dhcp_spec.rb +++ b/spec/classes/neutron_agents_dhcp_spec.rb @@ -45,7 +45,6 @@ describe 'neutron::agents::dhcp' do is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/dhcp_domain').with_value(''); 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(''); 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(''); is_expected.to contain_neutron_dhcp_agent_config('DEFAULT/enable_metadata_network').with_value(p[:enable_metadata_network]); diff --git a/spec/classes/neutron_agents_l3_spec.rb b/spec/classes/neutron_agents_l3_spec.rb index a071a844a..0911f5268 100644 --- a/spec/classes/neutron_agents_l3_spec.rb +++ b/spec/classes/neutron_agents_l3_spec.rb @@ -11,7 +11,6 @@ describe 'neutron::agents::l3' do :enabled => true, :debug => false, :interface_driver => 'neutron.agent.linux.interface.OVSInterfaceDriver', - :router_delete_namespaces => true, :ha_enabled => false, :ha_vrrp_auth_type => 'PASS', :ha_vrrp_advert_int => '3', @@ -48,7 +47,6 @@ describe 'neutron::agents::l3' do is_expected.to contain_neutron_l3_agent_config('DEFAULT/periodic_fuzzy_delay').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value('') is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_value('') - is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_delete_namespaces').with_value(p[:router_delete_namespaces]) end it 'installs neutron l3 agent package' do