From aa90e36dd25675bff00da117f085a5fde61a4fd5 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Thu, 9 Nov 2017 16:22:16 +0800 Subject: Modify the fuel deployment type judgement in fetch-os_creds.sh The BUILD_TAG on ZTE baremetal PODs don't include the word "baremetal".[1] Line 117 can't be correctly executed. Use a negative checking instead. [1] https://build.opnfv.org/ci/job/functest-fuel-zte-pod1-daily-master/206/injectedEnvVars/ Change-Id: I1a36494768e0172bcf6a016fd8f2524854c9b876 Signed-off-by: wu.zhihui --- 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 ac7595053..4bc585885 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -114,7 +114,7 @@ if [ "$installer_type" == "fuel" ]; then ssh ${ssh_options} "${ssh_user}@${controller_ip}" \ "sudo cat /root/keystonercv3" > "${dest_path}" - if [[ "${BUILD_TAG}" =~ "baremetal" ]]; then + if [[ ! "${BUILD_TAG}" =~ 'virtual' ]]; then ssh ${ssh_options} "${ssh_user}@${installer_ip}" \ "cat /etc/ssl/certs/os_cacert" > "${os_cacert}" fi -- cgit 1.2.3-korg