openstack/puppet-trove
Code Issues Proposed changes

Remove trove::default_neutron_networks

Browse Source 
... because the parameter was deprecated in the past cycle by [1].

[1] 74881548a4

Change-Id: I7b12225aa82a05bcb978a3b6adc975c3a5d6c75c
This commit is contained in:
Takashi Kajinami 2022-11-15 11:09:01 +09:00
parent a824170d55
commit 8838f7fa8c
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/init.pp
View File

@ -239,12 +239,6 @@
# (optional) The state of the package. # (optional) The state of the package.
# Defaults to 'present' # Defaults to 'present'
# #
# DEPRECATED PARAMETERS
#
# [*default_neutron_networks*]
# (optional) The network that trove will attach by default.
# Defaults to undef
#
class trove( class trove(
$default_transport_url = $::os_service_default, $default_transport_url = $::os_service_default,
$notification_transport_url = $::os_service_default, $notification_transport_url = $::os_service_default,
@ -296,19 +290,12 @@ class trove(
$neutron_endpoint_type = $::os_service_default, $neutron_endpoint_type = $::os_service_default,
$management_networks = $::os_service_default, $management_networks = $::os_service_default,
$package_ensure = 'present', $package_ensure = 'present',
# DEPRECATED PARAMETERS
$default_neutron_networks = undef,
) { ) {
include trove::deps include trove::deps
include trove::policy include trove::policy
include trove::params include trove::params
if $default_neutron_networks != undef {
warning('The default_neutron_networks parameter is deprecated. \
Use the management_networks parameter.')
}
if $nova_compute_url { if $nova_compute_url {
trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url } trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
} }
@ -377,15 +364,10 @@ Use the management_networks parameter.')
} }
} }
$management_networks_real = pick($default_neutron_networks, $management_networks)
trove_config {
'DEFAULT/default_neutron_networks': ensure => absent;
}
trove_config { trove_config {
'DEFAULT/network_label_regex': value => '.*'; 'DEFAULT/network_label_regex': value => '.*';
'DEFAULT/network_driver': value => 'trove.network.neutron.NeutronDriver'; 'DEFAULT/network_driver': value => 'trove.network.neutron.NeutronDriver';
'DEFAULT/management_networks': value => join(any2array($management_networks_real), ','); 'DEFAULT/management_networks': value => join(any2array($management_networks), ',');
} }
oslo::messaging::default { 'trove_config': oslo::messaging::default { 'trove_config':

4
releasenotes/notes/remove-default_neutron_networks-1f133abd9e127a35.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``trove::default_neutron_networks`` parameter has been removed.