openstack/puppet-openstack-integration
Code Issues Proposed changes

Use ecdsa key in Ubuntu

Browse Source 
Currently tempest in Ubuntu integration jobs are consistently failing
because ssh does never succeeds. This change switches from RSA key to
ECDSA key in Ubuntu jobs as well as CentOS jobs, to fix it.

Change-Id: I5d53eea3434be8fa425467b2346da368cd046473
(cherry picked from commit c73ab5b154)
This commit is contained in:
Takashi Kajinami
2022-08-29 01:20:59 +09:00
parent 1d362b157e
commit 4e04bb7667
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/tempest.pp
View File

@@ -212,15 +212,6 @@ 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'
}
$dashboard_url = $::osfamily ? {
'RedHat' => "${::openstack_integration::config::base_url}/dashboard",
default => "${::openstack_integration::config::base_url}/horizon"
@@ -288,7 +279,10 @@ class openstack_integration::tempest (
murano_available => $murano,
tempest_workspace => '/tmp/openstack/tempest',
run_ssh => true,
ssh_key_type => $ssh_key_type,
# NOTE(tkajinam): The recent openssl doesn't accept SHA1 by default, which
# is causing ssh with rsa keys to fail.
# See bug 1962507 for details.
ssh_key_type => 'ecdsa',
l2gw_switch => $l2gw_switch,
disable_dashboard_ssl_validation => true,
baremetal_driver => 'fake-hardware',