summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 23:59:26 +0000
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 23:59:26 +0000
commitf2b6d874e117178121da26c43fccbfebf8312ceb (patch)
treeb8a6316f16946d6cd1d454bc6a91b5fba654ce36
parent3f27c8b519e42295bd76ace5506903f265e48560 (diff)
Revert "fetch_os_creds.sh: Fix unbound BUILD_TAG"
This reverts commit 3f27c8b519e42295bd76ace5506903f265e48560. Change-Id: I024ba8c0b960387138a71be9bc19f6d1b72030ca
-rwxr-xr-xutils/fetch_os_creds.sh6
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