Modify the fuel deployment type judgement in fetch-os_creds.sh 29/46929/2
authorwu.zhihui <wu.zhihui1@zte.com.cn>
Thu, 9 Nov 2017 08:22:16 +0000 (16:22 +0800)
committerwu.zhihui <wu.zhihui1@zte.com.cn>
Fri, 10 Nov 2017 08:00:21 +0000 (16:00 +0800)
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 <wu.zhihui1@zte.com.cn>
utils/fetch_os_creds.sh

index ac75950..4bc5858 100755 (executable)
@@ -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