openstack/puppet-neutron
Code Issues Proposed changes

Remove router_id option

Browse Source 
Remove 'router_id' configuration option from the
l3_agent.ini file.

Read the information[1] to learn more.
[1] http://git.openstack.org/cgit/openstack/neutron/tree/releasenotes/notes/remove-router_id-b3732089f8f1faa1.yaml

Change-Id: I37b76a39434f82a5fa9c0a3f030cfdba7c2b1511
This commit is contained in:
ZhongShengping 2016-07-12 09:32:38 +08:00
parent d591774c54
commit a30d2e7d77
3 changed files with 4 additions and 11 deletions
manifests/agents
l3.pp
releasenotes/notes
remove_router_id-51df87135a4e1725.yaml
spec/classes
neutron_agents_l3_spec.rb

10
manifests/agents/l3.pp

@ -94,10 +94,6 @@
# (optional) Deprecated. The name of the external bridge # (optional) Deprecated. The name of the external bridge
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*router_id*]
# (optional) Deprecated. The ID of the external router in neutron
# Defaults to $::os_service_default
#
class neutron::agents::l3 ( class neutron::agents::l3 (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
@ -120,7 +116,6 @@ class neutron::agents::l3 (
$availability_zone = $::os_service_default, $availability_zone = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$external_network_bridge = $::os_service_default, $external_network_bridge = $::os_service_default,
$router_id = $::os_service_default,
) { ) {
include ::neutron::deps include ::neutron::deps
@ -130,10 +125,6 @@ class neutron::agents::l3 (
warning('parameter external_network_bridge is deprecated') warning('parameter external_network_bridge is deprecated')
} }
if ! is_service_default ($router_id) {
warning('parameter router_id is deprecated and will be removed in future release')
}
resources { 'neutron_l3_agent_config': resources { 'neutron_l3_agent_config':
purge => $purge_config, purge => $purge_config,
} }
@ -150,7 +141,6 @@ class neutron::agents::l3 (
'DEFAULT/debug': value => $debug; 'DEFAULT/debug': value => $debug;
'DEFAULT/external_network_bridge': value => $external_network_bridge; 'DEFAULT/external_network_bridge': value => $external_network_bridge;
'DEFAULT/interface_driver': value => $interface_driver; 'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/router_id': value => $router_id;
'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id; 'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id;
'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers; 'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers;
'DEFAULT/metadata_port': value => $metadata_port; 'DEFAULT/metadata_port': value => $metadata_port;

4
releasenotes/notes/remove_router_id-51df87135a4e1725.yaml Normal file

@ -0,0 +1,4 @@
---
deprecations:
- Remove 'router_id' configuration option from the
l3_agent.ini file.

1
spec/classes/neutron_agents_l3_spec.rb

@ -39,7 +39,6 @@ describe 'neutron::agents::l3' do
is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug]) is_expected.to contain_neutron_l3_agent_config('DEFAULT/debug').with_value(p[:debug])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/external_network_bridge').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_l3_agent_config('DEFAULT/external_network_bridge').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]) is_expected.to contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
is_expected.to contain_neutron_l3_agent_config('DEFAULT/router_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value('<SERVICE DEFAULT>')