openstack/puppet-neutron
Code Issues Proposed changes

Merge "Deprecate router[dhcp]_delete_namespaces parameter"

Browse Source
This commit is contained in:
Jenkins 2016-02-16 10:14:16 +00:00 committed by Gerrit Code Review
commit 96bc79b71f
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/agents/dhcp.pp
View File

@ -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) {

15
manifests/agents/l3.pp
View File

@ -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;

1
spec/classes/neutron_agents_dhcp_spec.rb
View File

@ -45,7 +45,6 @@ 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('<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]);

2
spec/classes/neutron_agents_l3_spec.rb
View File

@ -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('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/enable_metadata_proxy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/network_device_mtu').with_value('<SERVICE DEFAULT>')
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