From 34929ee1025ef7b51a97138af2d74b8ab3014aa5 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 20 Sep 2025 18:56:28 +0900 Subject: [PATCH] Rename run_ssh parameter The run_ssh option was renamed to the run_validation option multiple releases ago[1]. Rename the parameter to use the consistent name. Also the option defaults to false, so the explicit default value can be replaced by service default. [1] e5cca002ef4a4fa72108ec2af102ae69f873c3aa Change-Id: Ief044e32b03f915c72caf1bba0f80d709e24e129 Signed-off-by: Takashi Kajinami --- manifests/init.pp | 19 +++++++++++++++---- .../run_validation-270845d9b5da32b4.yaml | 5 +++++ spec/classes/tempest_init_spec.rb | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/run_validation-270845d9b5da32b4.yaml diff --git a/manifests/init.pp b/manifests/init.pp index a22d471e..525b4242 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -108,8 +108,8 @@ # Defaults to $facts['os_service_default'] # [*image_alt_ssh_user*] # Defaults to $facts['os_service_default'] -# [*run_ssh*] -# Defaults to false +# [*run_validation*] +# Defaults to $facts['os_service_default'] # [*ssh_key_type*] # Defaults to $facts['os_service_default'] # [*attach_encrypted_volume*] @@ -347,6 +347,8 @@ # Defaults to undef # [*run_service_broker_tests*] # Defaults to undef +# [*run_ssh*] +# Defaults to undef # class tempest ( $package_ensure = 'present', @@ -427,7 +429,7 @@ class tempest ( # ssh information $image_ssh_user = $facts['os_service_default'], $image_alt_ssh_user = $facts['os_service_default'], - $run_ssh = false, + $run_validation = $facts['os_service_default'], $ssh_key_type = $facts['os_service_default'], # intervals/timeouts $compute_build_interval = $facts['os_service_default'], @@ -557,6 +559,7 @@ class tempest ( $keystone_v3 = undef, $auth_version = undef, $run_service_broker_tests = undef, + $run_ssh = undef, ) { [ 'glance_v2', @@ -574,6 +577,14 @@ class tempest ( warning('The run_service_broker_tests parameter is deprecated and has no effect.') } + if $run_ssh != undef { + warning('The run_ssh parameter is deprecated. Use the run_validation parameter instead.') + } + $run_validation_real = $run_ssh ? { + undef => $run_validation, + default => $run_ssh, + } + include tempest::params include openstacklib::openstackclient @@ -671,7 +682,7 @@ class tempest ( 'object-storage/build_timeout': value => $object_storage_build_timeout; 'validation/image_ssh_user': value => $image_ssh_user; 'validation/image_alt_ssh_user': value => $image_alt_ssh_user; - 'validation/run_validation': value => $run_ssh; + 'validation/run_validation': value => $run_validation_real; 'validation/ssh_key_type': value => $ssh_key_type; 'identity/admin_role': value => $admin_role; 'identity/alt_password': value => $alt_password, secret => true; diff --git a/releasenotes/notes/run_validation-270845d9b5da32b4.yaml b/releasenotes/notes/run_validation-270845d9b5da32b4.yaml new file mode 100644 index 00000000..f5d718d5 --- /dev/null +++ b/releasenotes/notes/run_validation-270845d9b5da32b4.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``tempest::run_ssh`` parameter has been deprecated in favor of the new + ``tempest::run_validation`` parameter. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 871b1d0c..1756039c 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -220,7 +220,7 @@ describe 'tempest' do is_expected.to contain_tempest_config('compute-feature-enabled/vnc_console').with(:value => '') is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => '') is_expected.to contain_tempest_config('validation/image_alt_ssh_user').with(:value => '') - is_expected.to contain_tempest_config('validation/run_validation').with(:value => false) + is_expected.to contain_tempest_config('validation/run_validation').with(:value => '') is_expected.to contain_tempest_config('validation/ssh_key_type').with(:value => '') is_expected.to contain_tempest_config('identity/admin_role').with(:value => '') is_expected.to contain_tempest_config('identity/auth_version').with(:value => '')