openstack/puppet-neutron
Code Issues Proposed changes

Deprecate neutron::agents::l3::gateway_external_network_id

Browse Source 
Its actual parameter in neutron was already deprecated[1], and now is
useless because external_network_bridge is no longer set.

[1] 391ac43bf3862d67cee3ea0f628bd7958e585c7f

Change-Id: I66b26f2ca503826d3f414717ef3722a6c356f981
This commit is contained in:
Takashi Kajinami 2020-04-25 22:50:19 +09:00
parent 085747a2a5
commit a962699bc7
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifests/agents/l3.pp
View File

@ -26,10 +26,6 @@
# (optional) Driver to interface with neutron # (optional) Driver to interface with neutron
# Defaults to OVSInterfaceDriver # Defaults to OVSInterfaceDriver
# #
# [*gateway_external_network_id*]
# (optional) The ID of the external network in neutron
# Defaults to $::os_service_default
#
# [*handle_internal_only_routers*] # [*handle_internal_only_routers*]
# (optional) L3 Agent will handle non-external routers # (optional) L3 Agent will handle non-external routers
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -95,13 +91,18 @@
# will be passed. # will be passed.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# DEPRECATED PARAMETERS
#
# [*gateway_external_network_id*]
# (optional) The ID of the external network in neutron
# Defaults to undef
#
class neutron::agents::l3 ( class neutron::agents::l3 (
$package_ensure = 'present', $package_ensure = 'present',
$enabled = true, $enabled = true,
$manage_service = true, $manage_service = true,
$debug = $::os_service_default, $debug = $::os_service_default,
$interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver', $interface_driver = 'neutron.agent.linux.interface.OVSInterfaceDriver',
$gateway_external_network_id = $::os_service_default,
$handle_internal_only_routers = $::os_service_default, $handle_internal_only_routers = $::os_service_default,
$metadata_port = $::os_service_default, $metadata_port = $::os_service_default,
$periodic_interval = $::os_service_default, $periodic_interval = $::os_service_default,
@ -116,11 +117,21 @@ class neutron::agents::l3 (
$availability_zone = $::os_service_default, $availability_zone = $::os_service_default,
$extensions = $::os_service_default, $extensions = $::os_service_default,
$radvd_user = $::os_service_default, $radvd_user = $::os_service_default,
# DEPRECATED PARAMETERS
$gateway_external_network_id = undef,
) { ) {
include neutron::deps include neutron::deps
include neutron::params include neutron::params
if $gateway_external_network_id != undef {
warning('gateway_external_network_id parameter is deprecated and has no effect')
}
neutron_l3_agent_config {
'DEFAULT/gateway_external_network_id': ensure => absent;
}
resources { 'neutron_l3_agent_config': resources { 'neutron_l3_agent_config':
purge => $purge_config, purge => $purge_config,
} }
@ -136,7 +147,6 @@ class neutron::agents::l3 (
neutron_l3_agent_config { neutron_l3_agent_config {
'DEFAULT/debug': value => $debug; 'DEFAULT/debug': value => $debug;
'DEFAULT/interface_driver': value => $interface_driver; 'DEFAULT/interface_driver': value => $interface_driver;
'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;
'DEFAULT/periodic_interval': value => $periodic_interval; 'DEFAULT/periodic_interval': value => $periodic_interval;

5
releasenotes/notes/deprecate_gateway_external_network_id-ba56dde346c38e90.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The neutron::agents::l3::gateway_external_network_id parameter has been
deprecated and has no effect.

1
spec/classes/neutron_agents_l3_spec.rb
View File

@ -32,7 +32,6 @@ describe 'neutron::agents::l3' do
it 'configures l3_agent.ini' do it 'configures l3_agent.ini' do
should contain_neutron_l3_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>') should contain_neutron_l3_agent_config('DEFAULT/debug').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver]) should contain_neutron_l3_agent_config('DEFAULT/interface_driver').with_value(p[:interface_driver])
should contain_neutron_l3_agent_config('DEFAULT/gateway_external_network_id').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>') should contain_neutron_l3_agent_config('DEFAULT/handle_internal_only_routers').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value('<SERVICE DEFAULT>') should contain_neutron_l3_agent_config('DEFAULT/metadata_port').with_value('<SERVICE DEFAULT>')
should contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value('<SERVICE DEFAULT>') should contain_neutron_l3_agent_config('DEFAULT/periodic_interval').with_value('<SERVICE DEFAULT>')