[MOSK] Fix generation of clouds.yaml
relative path inside bash code is broken sometimes
MOSSUST-122
Change-Id: Ib58c1fb3b0d125bc6f49c16dbb12c37d921a18d6
diff --git a/bm_mcc_mosk/seed/get_openstack_credentials.sh b/bm_mcc_mosk/seed/get_openstack_credentials.sh
index 8371ff3..968eb7f 100755
--- a/bm_mcc_mosk/seed/get_openstack_credentials.sh
+++ b/bm_mcc_mosk/seed/get_openstack_credentials.sh
@@ -1,5 +1,6 @@
#!/bin/bash
export KUBECONFIG=/root/child.kubeconfig
mkdir -p /root/.config/openstack
-kubectl -n openstack-external get secrets openstack-identity-credentials -o jsonpath='{.data.clouds\.yaml}' | base64 -d > /root/clouds.yaml
+/root/kaas-bootstrap/bin/kubectl -n openstack-external get secrets openstack-identity-credentials -o jsonpath='{.data.clouds\.yaml}' | base64 -d > /root/clouds.yaml
+rm -f /root/.config/openstack/clouds.yaml
ln -s /root/clouds.yaml /root/.config/openstack/clouds.yaml
diff --git a/bm_mcc_mosk/utils/update_bash_autocompletion_kaas.sh b/bm_mcc_mosk/utils/update_bash_autocompletion_kaas.sh
index 6be1dac..01adf6e 100755
--- a/bm_mcc_mosk/utils/update_bash_autocompletion_kaas.sh
+++ b/bm_mcc_mosk/utils/update_bash_autocompletion_kaas.sh
@@ -9,9 +9,9 @@
if [ -f ~/child.kubeconfig ]; then export KUBECONFIG=~/child.kubeconfig; fi
if [[ -f ~/clouds.yaml && -f /usr/local/bin/yq ]] ; then
export OS_CLOUD=admin
- OS_USERNAME=\$(yq .clouds.admin.auth.username clouds.yaml)
- OS_PASSWORD=\$(yq .clouds.admin.auth.password clouds.yaml)
- OS_AUTH_URL=\$(yq .clouds.admin.auth.auth_url clouds.yaml)
+ OS_USERNAME=\$(yq .clouds.admin.auth.username ~/clouds.yaml)
+ OS_PASSWORD=\$(yq .clouds.admin.auth.password ~/clouds.yaml)
+ OS_AUTH_URL=\$(yq .clouds.admin.auth.auth_url ~/clouds.yaml)
fi
echo