Add support for [validation] ssh_key_type

Ssh with rsa key doesn't work with the current latest openssl in c9s.
This change adds support for the [validation] ssh_key_type parameter
so that we can use ecdsa key as well.

Change-Id: Ide33c6c84f7dbfa8830913a8a13c88d936e7f20d
This commit is contained in:
Takashi Kajinami 2022-03-01 14:44:38 +09:00
parent bd09b822b9
commit 744bdad845
3 changed files with 9 additions and 0 deletions

View File

@ -98,6 +98,8 @@
# Defaults to undef
# [*run_ssh*]
# Defaults to false
# [*ssh_key_type*]
# Defaults to $::os_service_default
# [*flavor_name*]
# Defaults to undef
# [*flavor_name_alt*]
@ -320,6 +322,7 @@ class tempest(
$flavor_name_alt = undef,
$compute_build_interval = undef,
$run_ssh = false,
$ssh_key_type = $::os_service_default,
# whitebox
$whitebox_db_uri = undef,
# testing features that are supported
@ -539,6 +542,7 @@ class tempest(
'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/ssh_key_type': value => $ssh_key_type;
'identity/admin_role': value => $admin_role;
'identity/alt_password': value => $alt_password, secret => true;
'identity/alt_project_name': value => $alt_project_name;

View File

@ -0,0 +1,4 @@
---
features:
- |
Support for the ``[validation] ssh_key_type`` parameter has been added.

View File

@ -219,6 +219,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('validation/image_alt_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('validation/run_validation').with(:value => false)
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 => nil)
is_expected.to contain_tempest_config('identity/auth_version').with(:value => 'v3')
is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil)