Merge "Use ecdsa key in CentOS 9 Stream"

This commit is contained in:
Zuul 2022-03-03 15:32:00 +00:00 committed by Gerrit Code Review
commit 8a650d5a14

View File

@ -212,6 +212,15 @@ class openstack_integration::tempest (
}
}
if ($::osfamily == 'RedHat') and (versioncmp($::operatingsystemmajrelease, '9') >= 0) {
# NOTE(tkajinam): The latest openssl in c9s repo doesn't accept SHA1 by
# default, which is causing ssh with rsa keys to fail.
# See bug 1962507 for details.
$ssh_key_type = 'ecdsa'
} else {
$ssh_key_type = 'rsa'
}
class { 'tempest':
debug => true,
use_stderr => false,
@ -274,6 +283,7 @@ class openstack_integration::tempest (
murano_available => $murano,
tempest_workspace => '/tmp/openstack/tempest',
run_ssh => true,
ssh_key_type => $ssh_key_type,
l2gw_switch => $l2gw_switch,
disable_dashboard_ssl_validation => true,
baremetal_driver => 'fake-hardware',