openstack/puppet-neutron
Code Issues Proposed changes

Merge "Remove router_id option"

Browse Source
This commit is contained in:
Jenkins
2016-07-27 15:46:45 +00:00
committed by Gerrit Code Review
parent 6efa8d2c93 a30d2e7d77
commit a16cccbe1b
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/agents/l3.pp
View File

@@ -94,10 +94,6 @@
# (optional) Deprecated. The name of the external bridge
# 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 (
$package_ensure = 'present',
$enabled = true,
@@ -120,7 +116,6 @@ class neutron::agents::l3 (
$availability_zone = $::os_service_default,
# DEPRECATED PARAMETERS
$external_network_bridge = $::os_service_default,
$router_id = $::os_service_default,
) {
include ::neutron::deps
@@ -130,10 +125,6 @@ class neutron::agents::l3 (
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':
purge => $purge_config,
}
@@ -150,7 +141,6 @@ class neutron::agents::l3 (
'DEFAULT/debug': value => $debug;
'DEFAULT/external_network_bridge': value => $external_network_bridge;
'DEFAULT/interface_driver': value => $interface_driver;
'DEFAULT/router_id': value => $router_id;
'DEFAULT/gateway_external_network_id': value => $gateway_external_network_id;
'DEFAULT/handle_internal_only_routers': value => $handle_internal_only_routers;
'DEFAULT/metadata_port': value => $metadata_port;

4
releasenotes/notes/remove_router_id-51df87135a4e1725.yaml Normal file
View 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
View File

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