openstack/puppet-tempest
Code Issues Proposed changes

Drop support for [service_broker] run_service_broker_tests

Browse Source 
This option was used by murano-tempest-plugin, which is no longer
supported.

Change-Id: I1ddfcbcf0d04acea9de6b55f34a2cddae554fddb
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-12 23:24:57 +09:00
parent 7f671c18c5
commit 1cbabff841
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/init.pp
View File

@@ -168,8 +168,6 @@
# Defaults to false # Defaults to false
# [*vitrage_available*] # [*vitrage_available*]
# Defaults to false # Defaults to false
# [*run_service_broker_tests*]
# Defaults to $facts['os_service_default']
# [*swift_available*] # [*swift_available*]
# Defaults to false # Defaults to false
# [*trove_available*] # [*trove_available*]
@@ -351,6 +349,8 @@
# Defaults to undef # Defaults to undef
# [*auth_version*] # [*auth_version*]
# Defaults to undef # Defaults to undef
# [*run_service_broker_tests*]
# Defaults to undef
# #
class tempest( class tempest(
$package_ensure = 'present', $package_ensure = 'present',
@@ -522,7 +522,6 @@ class tempest(
$dns_catalog_type = $facts['os_service_default'], $dns_catalog_type = $facts['os_service_default'],
$load_balancer_catalog_type = $facts['os_service_default'], $load_balancer_catalog_type = $facts['os_service_default'],
$share_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'], $ca_certificates_file = $facts['os_service_default'],
$disable_ssl_validation = $facts['os_service_default'], $disable_ssl_validation = $facts['os_service_default'],
Boolean $manage_tests_packages = false, Boolean $manage_tests_packages = false,
@@ -559,6 +558,7 @@ class tempest(
$identity_uri = undef, $identity_uri = undef,
$keystone_v3 = undef, $keystone_v3 = undef,
$auth_version = 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 tempest::params
include openstacklib::openstackclient include openstacklib::openstackclient
@@ -769,7 +773,6 @@ class tempest(
'share/catalog_type': value => $share_catalog_type; 'share/catalog_type': value => $share_catalog_type;
'scenario/img_file': value => $img_file; 'scenario/img_file': value => $img_file;
'scenario/img_disk_format': value => $img_disk_format; '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/attach_encrypted_volume': value => $attach_encrypted_volume;
'compute-feature-enabled/resize': value => $resize_available; 'compute-feature-enabled/resize': value => $resize_available;
'compute-feature-enabled/vnc_console': value => $vnc_console; 'compute-feature-enabled/vnc_console': value => $vnc_console;
@@ -814,6 +817,11 @@ class tempest(
'telemetry_services/alarm_backend': value => $alarm_backend; '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::concurrency { 'tempest_config': lock_path => $lock_path }
oslo::log { 'tempest_config': oslo::log { 'tempest_config':

5
releasenotes/notes/deprecate-run_service_broker_tests-be2037202f5985bf.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``tempest::run_service_broker_tests`` parameter has been deprecated,
and has no effect now.

1
spec/classes/tempest_init_spec.rb
View File

@@ -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_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 => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('scenario/img_disk_format').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('service_broker/run_service_broker_tests').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_oslo__log('tempest_config').with( is_expected.to contain_oslo__log('tempest_config').with(
:debug => '<SERVICE DEFAULT>', :debug => '<SERVICE DEFAULT>',
:log_file => '<SERVICE DEFAULT>', :log_file => '<SERVICE DEFAULT>',