diff --git a/manifests/init.pp b/manifests/init.pp index cd483765..18ea62f2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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; diff --git a/releasenotes/notes/remove-img_dir-1ca314f67b227268.yaml b/releasenotes/notes/remove-img_dir-1ca314f67b227268.yaml new file mode 100644 index 00000000..98bde3cc --- /dev/null +++ b/releasenotes/notes/remove-img_dir-1ca314f67b227268.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The ``tempest::img_dir`` parameter has been removed. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 98a80b68..a600ab9b 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -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,