From fa6d478da2dbf940c9ea816ab5513ed4b14d56be Mon Sep 17 00:00:00 2001
From: Olivier Grand <oliv.grand@orange.com>
Date: Thu, 27 May 2021 15:17:23 +0000
Subject: [PATCH] fix log-openstack for multi-region

---
 bosh-cli/log-openstack.sh | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/bosh-cli/log-openstack.sh b/bosh-cli/log-openstack.sh
index 9faef9c..cd6a143 100644
--- a/bosh-cli/log-openstack.sh
+++ b/bosh-cli/log-openstack.sh
@@ -25,31 +25,48 @@ if [ $? != 0 ] ; then
   fi
 fi
 
+#--- Select openstack region
+flag=0
+while [ ${flag} = 0 ] ; do
+  flag=1
+  printf "\n%bOpenstack :%b\n\n" "${REVERSE}${GREEN}" "${STD}"
+  printf "%b1%b : region 1\n" "${GREEN}${BOLD}" "${STD}"
+  printf "%b2%b : region 2\n" "${GREEN}${BOLD}" "${STD}"
+  printf "%b3%b : region 3\n" "${GREEN}${BOLD}" "${STD}"
+  printf "\n%bYour choice :%b " "${GREEN}${BOLD}" "${STD}" ; read choice
+  case "${choice}" in
+    1) OPENSTACK_PREFIX="openstack" ;;
+    2) OPENSTACK_PREFIX="openstack_2" ;;
+    3) OPENSTACK_PREFIX="openstack_3" ;;
+    *) flag=0 ; clear ;;
+  esac
+done
+
 #--- Log to openstack
 if [ "${flagError}" = "0" ] ; then
   #--- Common keystone parameters V2/V3
-  getCredhubValue "OS_AUTH_URL" "/secrets/openstack_auth_url"
+  getCredhubValue "OS_AUTH_URL" "/secrets/${OPENSTACK_PREFIX}_auth_url"
   OS_AUTH_URL="$(echo "${OS_AUTH_URL}" | sed -e "s+/$++")"
-  getCredhubValue "OS_USERNAME" "/secrets/openstack_username"
-  getCredhubValue "OS_PASSWORD" "/secrets/openstack_password"
+  getCredhubValue "OS_USERNAME" "/secrets/${OPENSTACK_PREFIX}_username"
+  getCredhubValue "OS_PASSWORD" "/secrets/${OPENSTACK_PREFIX}_password"
   export OS_AUTH_URL
   export OS_USERNAME
   export OS_PASSWORD
 
   unset OS_PROJECT_NAME
-  getCredhubValue "OS_PROJECT_NAME" "/secrets/openstack_project"
+  getCredhubValue "OS_PROJECT_NAME" "/secrets/${OPENSTACK_PREFIX}_project"
   if [ ${flagError} = 0 ] ; then
     #--- Specific keystone V3
     export OS_PROJECT_NAME
     export OS_IDENTITY_API_VERSION="3"
-    getCredhubValue "OS_PROJECT_DOMAIN_NAME" "/secrets/openstack_domain"
+    getCredhubValue "OS_PROJECT_DOMAIN_NAME" "/secrets/${OPENSTACK_PREFIX}_domain"
     export OS_PROJECT_DOMAIN_NAME
     export OS_USER_DOMAIN_NAME="${OS_PROJECT_DOMAIN_NAME}"
   else
     #--- Specific keystone V2
     flagError=0
-    getCredhubValue "OS_TENANT_NAME" "/secrets/openstack_tenant"
-    getCredhubValue "OS_REGION_NAME" "/secrets/openstack_region"
+    getCredhubValue "OS_TENANT_NAME" "/secrets/${OPENSTACK_PREFIX}_tenant"
+    getCredhubValue "OS_REGION_NAME" "/secrets/${OPENSTACK_PREFIX}_region"
     export OS_TENANT_NAME
     export OS_REGION_NAME
   fi