openstack
/
puppet-tempest
Code Issues Proposed changes

Remove img_dir parameter 

... because it was deprecated during Victoria cycle[1].

[1] dacf254b8e

Change-Id: Ic0501b6d53d0ce38fec45ce125bf184e89e87b24
This commit is contained in:
Takashi Kajinami 2022-02-14 09:39:55 +09:00
parent d65c6ab9a7
commit 97cb83dfe9
3 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
manifests/init.pp
View File

@ -229,8 +229,6 @@
# Defaults to $::os_service_default
#
# DEPREACTED PARAMETERS
# [*img_dir*]
# Defaults to undef
# [*panko_available*]
# Defaults to undef
# [*keystone_v2*]
@ -370,8 +368,7 @@ class tempest(
$disable_ssl_validation = undef,
$manage_tests_packages = false,
# scenario options
# TODO(tkajinam) Update the default value when we remove img_dir parameter
$img_file = undef,
$img_file = '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img',
# designate options
$designate_nameservers = undef,
# ironic options
@ -386,7 +383,6 @@ class tempest(
$load_balancer_global_observer_role = $::os_service_default,
$load_balancer_test_with_noop = $::os_service_default,
# DEPRECATED PARAMETERS
$img_dir = undef,
$panko_available = undef,
$keystone_v2 = undef,
$change_password_available = undef,
@ -401,21 +397,6 @@ class tempest(
$tempest_roles_real = $::os_service_default
}
if $img_dir != undef {
warning('The tempest::img_dir parameter is deperecated. Set full path in img_file parameter instead')
if $img_file == undef {
$img_file_real = "${img_dir}/cirros-0.4.0-x86_64-disk.img"
} else {
$img_file_real = "${img_dir}/${img_file}"
}
} else {
if $img_file == undef {
$img_file_real = '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img'
} else {
$img_file_real = $img_file
}
}
if $panko_available != undef {
warning('The panko_available parameter has been deprecated and has no effect')
}
@ -615,7 +596,7 @@ class tempest(
'enforce_scope/nova': value => $nova_enforce_scope;
'whitebox/db_uri': value => $whitebox_db_uri;
'cli/cli_dir': value => $cli_dir;
'scenario/img_file': value => $img_file_real;
'scenario/img_file': value => $img_file;
'service_broker/run_service_broker_tests': value => $run_service_broker_tests;
'dns/nameservers': value => $designate_nameservers;
'compute-feature-enabled/attach_encrypted_volume': value => $attach_encrypted_volume;

4
releasenotes/notes/remove-img_dir-1ca314f67b227268.yaml Normal file
View File

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

27
spec/classes/tempest_init_spec.rb
View File

@ -330,7 +330,7 @@ describe 'tempest' do
end
end
context 'with deprecated img_dir parameter and img_file set' do
context 'with img_file set' do
let :params do
{ :image_name => 'cirros',
:image_name_alt => 'cirros' ,
@ -342,31 +342,6 @@ describe 'tempest' do
end
end
context 'with deprecated img_dir parameter set' do
let :params do
{ :image_name => 'cirros',
:image_name_alt => 'cirros',
:img_dir => '/home/stack' }
end
it 'sets image_file based on img_dir' do
is_expected.to contain_tempest_config('scenario/img_file').with(:value => '/home/stack/cirros-0.4.0-x86_64-disk.img')
end
end
context 'with deprecated img_dir parameter and img_file set' do
let :params do
{ :image_name => 'cirros',
:image_name_alt => 'cirros',
:img_dir => '/home/stack',
:img_file => 'myimage.img' }
end
it 'sets image_file based on img_dir and img_file' do
is_expected.to contain_tempest_config('scenario/img_file').with(:value => '/home/stack/myimage.img')
end
end
context 'install Tempest from package' do
let :params do
{:install_from_source => false,