openstack
/
puppet-tempest
Code Issues Proposed changes

Drop deprecated tempest class parameters 

This removes the parameters which were deprecated during the past
cycles[1][2].

[1] dbef30e09b
[2] ac0520fc45

Change-Id: I346882b36efd4ed3cd4c2608953ded68b9ed25a4
This commit is contained in:
Takashi Kajinami 2024-04-20 22:24:57 +09:00
parent b4ca842f18
commit cdf8ef2c33
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@ -313,12 +313,6 @@
# DEPREACTED PARAMETERS
# [*glance_v2*]
# Defaults to true
# [*tempest_config_file*]
# Defaults to undef
# [*cli_dir*]
# Defaults to undef
# [*login_url*]
# Defaults to undef
#
class tempest(
$package_ensure = 'present',
@ -507,19 +501,13 @@ class tempest(
$alarm_backend = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$glance_v2 = undef,
$tempest_config_file = undef,
$cli_dir = undef,
$login_url = undef,
) {
[ 'glance_v2', 'cli_dir', 'login_url' ].each |String $deprecated_opt| {
[ 'glance_v2' ].each |String $deprecated_opt| {
if getvar($deprecated_opt) != undef {
warning("The ${deprecated_opt} parameter has been deprecated and will be removed in a future release")
}
}
if $tempest_config_file != undef {
warning('The tempest_config_file parameter has been deprecated and has no effect')
}
[ 'neutron_bgpvpn_available', 'neutron_vpnaas_available', 'neutron_dr_available' ].each |$opt| {
if getvar($opt) != undef {
@ -665,7 +653,6 @@ class tempest(
'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ',');
'network/public_network_id': value => $public_network_id;
'network/public_router_id': value => $public_router_id;
'dashboard/login_url': value => pick($login_url, $facts['os_service_default']);
'dashboard/dashboard_url': value => $dashboard_url;
'dashboard/disable_ssl_certificate_validation': value => $disable_dashboard_ssl_validation;
'database/db_flavor_ref': value => $db_flavor_ref;
@ -717,7 +704,6 @@ class tempest(
'baremetal/max_microversion': value => $baremetal_max_microversion;
'share/min_api_microversion': value => $share_min_microversion;
'share/max_api_microversion': value => $share_max_microversion;
'cli/cli_dir': value => pick($cli_dir, $facts['os_service_default']);
'scenario/img_file': value => $img_file;
'scenario/img_disk_format': value => $img_disk_format;
'service_broker/run_service_broker_tests': value => $run_service_broker_tests;

8
releasenotes/notes/cleanup-params-dalmetian-4a21c2920f20b3bc.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The following ``tempest`` class parameters have been removed.
- ``tempest_config_file``
- ``cli_dir``
- ``login_url``

2
spec/classes/tempest_init_spec.rb
View File

@ -256,7 +256,6 @@ describe 'tempest' do
is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('network/public_network_id').with(:value => nil)
is_expected.to contain_tempest_config('network/public_router_id').with(:value => nil)
is_expected.to contain_tempest_config('dashboard/login_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('dashboard/dashboard_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('dashboard/disable_ssl_certificate_validation').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('database/db_flavor_ref').with(:value => nil)
@ -337,7 +336,6 @@ describe 'tempest' do
is_expected.to contain_tempest_config('telemetry_services/metric_backends').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('telemetry_services/alarm_backend').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('share/capability_storage_protocol').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('cli/cli_dir').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_oslo__concurrency('tempest_config').with(
:lock_path => '/var/lib/tempest'
)