Remove use_neutron parameter

... because it was deprecated during Yoga cycle[1] and has had no
effect since then.

[1] ddb0f14f95

Change-Id: Ib9eab7d3c174c11932afb05c66138dfe3cbf5a7c
This commit is contained in:
Takashi Kajinami 2022-05-20 22:36:54 +09:00
parent 4d87fa2c69
commit 18a4e46704
3 changed files with 12 additions and 18 deletions

View File

@ -241,10 +241,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*use_neutron*]
# (optional) Use Neutron
# Defaults to undef
#
# [*database_connection*] # [*database_connection*]
# (optional) Connection url to connect to trove database. # (optional) Connection url to connect to trove database.
# Defaults to undef. # Defaults to undef.
@ -322,7 +318,6 @@ class trove(
$default_neutron_networks = $::os_service_default, $default_neutron_networks = $::os_service_default,
$package_ensure = 'present', $package_ensure = 'present',
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$use_neutron = undef,
$database_connection = undef, $database_connection = undef,
$database_idle_timeout = undef, $database_idle_timeout = undef,
$database_max_retries = undef, $database_max_retries = undef,
@ -335,10 +330,6 @@ class trove(
include trove::policy include trove::policy
include trove::params include trove::params
if $use_neutron != undef {
warning('The trove::use_neutron parameter has been deprecated and has no effect.')
}
[ [
'database_connection', 'database_connection',
'database_idle_timeout', 'database_idle_timeout',

View File

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

View File

@ -101,6 +101,11 @@ describe 'trove' do
:tag => ['openstack', 'trove-package'], :tag => ['openstack', 'trove-package'],
) )
end end
it 'configures trove to use the Neutron network driver' do
is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('.*')
is_expected.to contain_trove_config('DEFAULT/network_driver').with_value('trove.network.neutron.NeutronDriver')
end
end end
context 'with single tenant mode enabled' do context 'with single tenant mode enabled' do
@ -115,19 +120,13 @@ describe 'trove' do
end end
end end
context 'when using Neutron' do context 'with default networks' do
let :params do let :params do
{ :use_neutron => true, { :default_neutron_networks => 'trove_service' }
:default_neutron_networks => 'trove_service' }
end end
it 'configures trove to use the Neutron network driver' do it 'configures default networks' do
is_expected.to contain_trove_config('DEFAULT/default_neutron_networks').with_value('trove_service') is_expected.to contain_trove_config('DEFAULT/default_neutron_networks').with_value('trove_service')
is_expected.to contain_trove_config('DEFAULT/network_driver').with_value('trove.network.neutron.NeutronDriver')
end
it 'configures trove to use any network label' do
is_expected.to contain_trove_config('DEFAULT/network_label_regex').with_value('.*')
end end
end end
end end