From d7aca20b047d2cbbafca0e3b40390a30d251e33a Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 11 Dec 2018 16:10:55 +0100
Subject: [utils, functest] Fix SSL-enabled Fuel condition

Fuel enables SSL based on scenario type (only for HA), not based
on cluster type (baremetal or virtual).

Change-Id: I3dc94f953e9a8ee0e94028577270ac05c9318ad6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 utils/fetch_os_creds.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 501095036..4a66187e5 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -113,7 +113,7 @@ if [ "$installer_type" == "fuel" ]; then
         ssh ${ssh_options} "${ssh_user}@${controller_ip}" \
             "sudo cat /root/keystonercv3" > "${dest_path}"
 
-        if [[ ! "${BUILD_TAG}" =~ 'virtual' ]]; then
+        if [[ ! "${DEPLOY_SCENARIO}" =~ -noha$ ]]; then
             ssh ${ssh_options} "${ssh_user}@${installer_ip}" \
                 "cat /etc/ssl/certs/os_cacert" > "${os_cacert}"
         fi
-- 
cgit 1.2.3-korg