diff options
| author |   wu.zhihui <wu.zhihui1@zte.com.cn> | 2017-11-09 16:22:16 +0800 |
|---|---|---|
| committer | wu.zhihui <wu.zhihui1@zte.com.cn> | 2017-11-10 16:00:21 +0800 |
| commit | aa90e36dd25675bff00da117f085a5fde61a4fd5 (patch) | |
| tree | 3d2913369f007e77fa4ff0da745f63ca2da8497e | |
| parent | 122cf34bf3e656e1b7fa35e07dd8a71e42ed4d59 (diff) | |
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 <wu.zhihui1@zte.com.cn>
| -rwxr-xr-x | utils/fetch_os_creds.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |