openstack
/
puppet-trove
Code Issues Proposed changes

Deprecate the use_neutron parameter 

... because nova-network was removed a while ago and now neutron should
be used always.

Change-Id: Icc23d46b18c0bdc0564219d3773f2a3b5d99a829
This commit is contained in:
Takashi Kajinami 2022-02-23 23:10:10 +09:00
parent f1c11c68d5
commit ddb0f14f95
3 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/init.pp
View File

@ -256,13 +256,9 @@
# (optional) Service endpoint type to use when searching catalog.
# Defaults to $::os_service_default
#
# [*use_neutron*]
# (optional) Use Neutron
# Defaults to true
#
# [*default_neutron_networks*]
# (optional) The network that trove will attach by default.
# Defaults to undef.
# Defaults to $::os_service_default.
#
# [*package_ensure*]
# (optional) The state of the package.
@ -289,6 +285,10 @@
# exceptions in the trove API service.
# Defaults to undef.
#
# [*use_neutron*]
# (optional) Use Neutron
# Defaults to undef
#
class trove(
$default_transport_url = $::os_service_default,
$notification_transport_url = $::os_service_default,
@ -344,7 +344,6 @@ class trove(
$glance_endpoint_type = $::os_service_default,
$trove_endpoint_type = $::os_service_default,
$neutron_endpoint_type = $::os_service_default,
$use_neutron = true,
$default_neutron_networks = $::os_service_default,
$package_ensure = 'present',
# DEPRECATED PARAMETERS
@ -352,12 +351,17 @@ class trove(
$nova_proxy_admin_pass = undef,
$nova_proxy_admin_tenant_name = undef,
$os_region_name = undef,
$use_neutron = undef,
) {
include trove::deps
include trove::policy
include trove::params
if $use_neutron != undef {
warning('The trove::use_neutron parameter has been deprecated and has no effect.')
}
if $nova_compute_url {
trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
}
@ -426,18 +430,10 @@ class trove(
}
}
if $use_neutron {
trove_config {
'DEFAULT/network_label_regex': value => '.*';
'DEFAULT/network_driver': value => 'trove.network.neutron.NeutronDriver';
'DEFAULT/default_neutron_networks': value => $default_neutron_networks;
}
} else {
trove_config {
'DEFAULT/network_label_regex': value => '^private$';
'DEFAULT/network_driver': value => 'trove.network.nova.NovaNetwork';
'DEFAULT/default_neutron_networks': ensure => absent;
}
trove_config {
'DEFAULT/network_label_regex': value => '.*';
'DEFAULT/network_driver': value => 'trove.network.neutron.NeutronDriver';
'DEFAULT/default_neutron_networks': value => $default_neutron_networks;
}
oslo::messaging::default { 'trove_config':

5
releasenotes/notes/deprecate-use_neutron-d39ccd82299c38b7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
deprecations:
- |
The ``trove:use_neutron`` parameter has been deprecated and has no effect
now. This parameter will be removed in a future release.

16
spec/classes/trove_init_spec.rb
View File

@ -130,22 +130,6 @@ describe 'trove' do
is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('.*')
end
end
context 'when using Nova Network' do
let :params do
{ :use_neutron => false }
end
it 'configures trove to use the Nova Network network driver' do
is_expected.to contain_trove_config('DEFAULT/default_neutron_networks').with_ensure('absent')
is_expected.to contain_trove_config('DEFAULT/network_driver').with_value('trove.network.nova.NovaNetwork')
end
it 'configures trove to use the "private" network label' do
is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('^private$')
end
end
end
on_supported_os({