Use ecdsa key in CentOS 9 Stream

... as rsa key no longer works with the latest openssl in CentOS 9
Stream repo.

Conflicts:
	manifests/tempest.pp

Backport note:
- RDO runs p-o-i scenarios on wallaby branch with CentOS Stream 9. This
  change is backported so that the same manifests can be leveraged in
  RDO CI.

Closes-Bug: #1962507
Depends-on: https://review.opendev.org/831782
Change-Id: I7a9a35a263d510301e437e84f7f7c56961977cf5
(cherry picked from commit 01fd062068)
(cherry picked from commit 4d59fa171f)
This commit is contained in:
Takashi Kajinami 2022-03-01 14:47:55 +09:00
parent 3c099fabfb
commit b4c2c9d56a
1 changed files with 10 additions and 0 deletions

View File

@ -202,6 +202,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,
@ -267,6 +276,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',