From 4e04bb76675d5c2ce40a922db8bedfb919498fd2 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 29 Aug 2022 01:20:59 +0900 Subject: [PATCH] Use ecdsa key in Ubuntu 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 c73ab5b154ee5d6dc24f308221513f74b5a364a4) --- manifests/tempest.pp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/manifests/tempest.pp b/manifests/tempest.pp index 8661b096f..76b05f6cd 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -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',