diff --git a/manifests/init.pp b/manifests/init.pp index 13cb2ff5..8b3bdcad 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -168,8 +168,6 @@ # Defaults to false # [*vitrage_available*] # Defaults to false -# [*run_service_broker_tests*] -# Defaults to $facts['os_service_default'] # [*swift_available*] # Defaults to false # [*trove_available*] @@ -351,6 +349,8 @@ # Defaults to undef # [*auth_version*] # Defaults to undef +# [*run_service_broker_tests*] +# Defaults to undef # class tempest( $package_ensure = 'present', @@ -522,7 +522,6 @@ class tempest( $dns_catalog_type = $facts['os_service_default'], $load_balancer_catalog_type = $facts['os_service_default'], $share_catalog_type = $facts['os_service_default'], - $run_service_broker_tests = $facts['os_service_default'], $ca_certificates_file = $facts['os_service_default'], $disable_ssl_validation = $facts['os_service_default'], Boolean $manage_tests_packages = false, @@ -559,6 +558,7 @@ class tempest( $identity_uri = undef, $keystone_v3 = undef, $auth_version = undef, + $run_service_broker_tests = undef, ) { [ @@ -579,6 +579,10 @@ class tempest( } } + if $run_service_broker_tests != undef { + warning('The run_service_broker_tests parameter is deprecated and has no effect.') + } + include tempest::params include openstacklib::openstackclient @@ -769,7 +773,6 @@ class tempest( 'share/catalog_type': value => $share_catalog_type; '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; 'compute-feature-enabled/attach_encrypted_volume': value => $attach_encrypted_volume; 'compute-feature-enabled/resize': value => $resize_available; 'compute-feature-enabled/vnc_console': value => $vnc_console; @@ -814,6 +817,11 @@ class tempest( 'telemetry_services/alarm_backend': value => $alarm_backend; } + # TODO(tkajinam): Remove this after 2026.1 release + tempest_config { + 'service_broker/run_service_broker_tests': ensure => absent + } + oslo::concurrency { 'tempest_config': lock_path => $lock_path } oslo::log { 'tempest_config': diff --git a/releasenotes/notes/deprecate-run_service_broker_tests-be2037202f5985bf.yaml b/releasenotes/notes/deprecate-run_service_broker_tests-be2037202f5985bf.yaml new file mode 100644 index 00000000..e938bc68 --- /dev/null +++ b/releasenotes/notes/deprecate-run_service_broker_tests-be2037202f5985bf.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``tempest::run_service_broker_tests`` parameter has been deprecated, + and has no effect now. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 7cc393fc..c3d18d34 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -346,7 +346,6 @@ describe 'tempest' do ) is_expected.to contain_tempest_config('scenario/img_file').with(:value => '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img') is_expected.to contain_tempest_config('scenario/img_disk_format').with(:value => '') - is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => '') is_expected.to contain_oslo__log('tempest_config').with( :debug => '', :log_file => '',