diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2017-10-05 01:16:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-05 01:16:41 +0000 |
| commit | cf7cc016686d352da2f2254243eaccfe1ccc7d83 (patch) | |
| tree | 36e8e4de09ceb8cb26f038910f4b7d0c7c42544e | |
| parent | 662a7b5ebe60f00263571a14fbe73d045964d79d (diff) | |
| parent | f2b6d874e117178121da26c43fccbfebf8312ceb (diff) | |
Merge "Revert "fetch_os_creds.sh: Fix unbound BUILD_TAG""
| -rwxr-xr-x | utils/fetch_os_creds.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 7a79da4f4..ac7595053 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -114,8 +114,10 @@ if [ "$installer_type" == "fuel" ]; then ssh ${ssh_options} "${ssh_user}@${controller_ip}" \ "sudo cat /root/keystonercv3" > "${dest_path}" - ssh ${ssh_options} "${ssh_user}@${installer_ip}" \ - "cat /etc/ssl/certs/os_cacert" > "${os_cacert}" || touch "${os_cacert}" + if [[ "${BUILD_TAG}" =~ "baremetal" ]]; then + ssh ${ssh_options} "${ssh_user}@${installer_ip}" \ + "cat /etc/ssl/certs/os_cacert" > "${os_cacert}" + fi else env=$(sshpass -p r00tme ssh 2>/dev/null ${ssh_options} root@${installer_ip} \ 'fuel env'|grep operational|head -1|awk '{print $1}') &> /dev/null |