openstack/puppet-tempest
Code Issues Proposed changes

Merge "Rename run_ssh parameter"

Browse Source
This commit is contained in:
Zuul
2025-09-25 17:53:42 +00:00
committed by Gerrit Code Review
parent 36cab307c1 34929ee102
commit 592ae6beb6
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
manifests/init.pp
View File

@@ -108,8 +108,8 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*image_alt_ssh_user*] # [*image_alt_ssh_user*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*run_ssh*] # [*run_validation*]
# Defaults to false # Defaults to $facts['os_service_default']
# [*ssh_key_type*] # [*ssh_key_type*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*attach_encrypted_volume*] # [*attach_encrypted_volume*]
@@ -347,6 +347,8 @@
# Defaults to undef # Defaults to undef
# [*run_service_broker_tests*] # [*run_service_broker_tests*]
# Defaults to undef # Defaults to undef
# [*run_ssh*]
# Defaults to undef
# #
class tempest ( class tempest (
$package_ensure = 'present', $package_ensure = 'present',
@@ -427,7 +429,7 @@ class tempest (
# ssh information # ssh information
$image_ssh_user = $facts['os_service_default'], $image_ssh_user = $facts['os_service_default'],
$image_alt_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'], $ssh_key_type = $facts['os_service_default'],
# intervals/timeouts # intervals/timeouts
$compute_build_interval = $facts['os_service_default'], $compute_build_interval = $facts['os_service_default'],
@@ -557,6 +559,7 @@ class tempest (
$keystone_v3 = undef, $keystone_v3 = undef,
$auth_version = undef, $auth_version = undef,
$run_service_broker_tests = undef, $run_service_broker_tests = undef,
$run_ssh = undef,
) { ) {
[ [
'glance_v2', 'glance_v2',
@@ -574,6 +577,14 @@ class tempest (
warning('The run_service_broker_tests parameter is deprecated and has no effect.') 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 tempest::params
include openstacklib::openstackclient include openstacklib::openstackclient
@@ -671,7 +682,7 @@ class tempest (
'object-storage/build_timeout': value => $object_storage_build_timeout; 'object-storage/build_timeout': value => $object_storage_build_timeout;
'validation/image_ssh_user': value => $image_ssh_user; 'validation/image_ssh_user': value => $image_ssh_user;
'validation/image_alt_ssh_user': value => $image_alt_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; 'validation/ssh_key_type': value => $ssh_key_type;
'identity/admin_role': value => $admin_role; 'identity/admin_role': value => $admin_role;
'identity/alt_password': value => $alt_password, secret => true; 'identity/alt_password': value => $alt_password, secret => true;

5
releasenotes/notes/run_validation-270845d9b5da32b4.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
deprecations:
- |
The ``tempest::run_ssh`` parameter has been deprecated in favor of the new
``tempest::run_validation`` parameter.

2
spec/classes/tempest_init_spec.rb
View File

@@ -220,7 +220,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('compute-feature-enabled/vnc_console').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('compute-feature-enabled/vnc_console').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('validation/image_alt_ssh_user').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('validation/image_alt_ssh_user').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('validation/run_validation').with(:value => false) is_expected.to contain_tempest_config('validation/run_validation').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('validation/ssh_key_type').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('validation/ssh_key_type').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/admin_role').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/admin_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/auth_version').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/auth_version').with(:value => '<SERVICE DEFAULT>')