delete openstack tools and reference to region 3

orange-cloudfoundry · Sep 13, 2024 · b13c9a2 · b13c9a2
1 parent 1f3f7e5
commit b13c9a2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 75 deletions.
diff --git a/tools/scripts/log-bosh.sh b/tools/scripts/log-bosh.sh
@@ -56,17 +56,15 @@ if [ ${flagError} = 0 ] ; then
       printf "%b3%b : ops\n" "${GREEN}${BOLD}" "${STD}"
       printf "%b4%b : coab\n" "${GREEN}${BOLD}" "${STD}"
       printf "%b5%b : remote-r2\n" "${GREEN}${BOLD}" "${STD}"
-      printf "%b6%b : remote-r3\n" "${GREEN}${BOLD}" "${STD}"
-      printf "%b7%b : remote-r4\n" "${GREEN}${BOLD}" "${STD}"
+      printf "%b6%b : remote-r4\n" "${GREEN}${BOLD}" "${STD}"
       printf "\n%bYour choice :%b " "${GREEN}${BOLD}" "${STD}" ; read choice
       case "${choice}" in
         1) BOSH_TARGET="micro" ;;
         2) BOSH_TARGET="master" ;;
         3) BOSH_TARGET="ops" ;;
         4) BOSH_TARGET="coab" ;;
         5) BOSH_TARGET="remote-r2" ;;
-        6) BOSH_TARGET="remote-r3" ;;
-        7) BOSH_TARGET="remote-r4" ;;
+        6) BOSH_TARGET="remote-r4" ;;
         *) flag=0 ; clear ;;
       esac
     done

diff --git a/tools/scripts/log-fly.sh b/tools/scripts/log-fly.sh
@@ -3,7 +3,7 @@
 # Log with fly (concourse) cli
 #===========================================================================
 
-TEAMS="main micro-depls master-depls ops-depls coab-depls gcp-depls remote-r2-depls remote-r3-depls remote-r4-depls"
+TEAMS="main micro-depls master-depls ops-depls coab-depls gcp-depls remote-r2-depls remote-r4-depls"
 flagError=0 ; flag_interactive=1 ; nbParameters=$#
 
 if [ ! -s "${BOSH_CA_CERT}" ] ; then
@@ -74,8 +74,7 @@ if [ ${flagError} = 0 ] ; then
       printf "%b5%b   : coab-depls\n" "${GREEN}${BOLD}" "${STD}"
       printf "%b6%b   : gcp-depls\n" "${GREEN}${BOLD}" "${STD}"
       printf "%b7%b   : remote-r2-depls\n" "${GREEN}${BOLD}" "${STD}"
-      printf "%b8%b   : remote-r3-depls\n" "${GREEN}${BOLD}" "${STD}"
-      printf "%b9%b   : remote-r4-depls\n" "${GREEN}${BOLD}" "${STD}"
+      printf "%b8%b   : remote-r4-depls\n" "${GREEN}${BOLD}" "${STD}"
       printf "\n%bYour choice :%b " "${GREEN}${BOLD}" "${STD}" ; read choice
       case "${choice}" in
         1) TEAM="main" ;;
@@ -85,8 +84,7 @@ if [ ${flagError} = 0 ] ; then
         5) TEAM="coab-depls" ;;
         6) TEAM="gcp-depls" ;;
         7) TEAM="remote-r2-depls" ;;
-        8) TEAM="remote-r3-depls" ;;
-        9) TEAM="remote-r4-depls" ;;
+        8) TEAM="remote-r4-depls" ;;
         *) flag=0 ; clear ;;
       esac
     done

diff --git a/tools/scripts/log-openstack.sh b/tools/scripts/log-openstack.sh
diff --git a/tools/scripts/log-uaac.sh b/tools/scripts/log-uaac.sh
@@ -61,21 +61,19 @@ if [ ${flagError} = 0 ] ; then
     printf "%b3%b : bosh-ops\n" "${GREEN}${BOLD}" "${STD}"
     printf "%b4%b : bosh-coab\n" "${GREEN}${BOLD}" "${STD}"
     printf "%b5%b : bosh-remote-r2\n" "${GREEN}${BOLD}" "${STD}"
-    printf "%b6%b : bosh-remote-r3\n" "${GREEN}${BOLD}" "${STD}"
-    printf "%b7%b : bosh-remote-r4\n" "${GREEN}${BOLD}" "${STD}"
-    printf "%b8%b : ops-routing (micro-depls/ops-routing)\n" "${GREEN}${BOLD}" "${STD}"
-    printf "%b9%b : cf (master-depls/cf)\n" "${GREEN}${BOLD}" "${STD}"
+    printf "%b6%b : bosh-remote-r4\n" "${GREEN}${BOLD}" "${STD}"
+    printf "%b7%b : ops-routing (micro-depls/ops-routing)\n" "${GREEN}${BOLD}" "${STD}"
+    printf "%b8%b : cf (master-depls/cf)\n" "${GREEN}${BOLD}" "${STD}"
     printf "\n%bYour choice :%b " "${GREEN}${BOLD}" "${STD}" ; read choice
     case "${choice}" in
       1) UAA_TARGET="https://192.168.10.10:8443" ; UAA_USER="uaa_admin" ; ADMIN_CLIENT_SECRET="$(getValue ${MICRO_BOSH_CREDENTIALS} /uaa_admin_client_secret)" ;;
       2) UAA_TARGET="https://192.168.116.158:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/micro-bosh/bosh-master/uaa_admin_client_secret" ;;
       3) UAA_TARGET="https://192.168.99.152:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-ops/uaa_admin_client_secret" ;;
       4) UAA_TARGET="https://192.168.99.155:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-coab/uaa_admin_client_secret" ;;
       5) UAA_TARGET="https://192.168.99.153:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-remote-r2/uaa_admin_client_secret" ;;
-      6) UAA_TARGET="https://192.168.99.156:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-remote-r3/uaa_admin_client_secret" ;;
-      7) UAA_TARGET="https://192.168.99.154:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-remote-r4/uaa_admin_client_secret" ;;
-      8) UAA_TARGET="https://uaa.${OPS_DOMAIN}" ; UAA_USER="admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/micro-bosh/ops-routing/uaa_admin_client_secret" ;;
-      9) UAA_TARGET="https://uaa.${SYSTEM_DOMAIN}" ; UAA_USER="admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/cf/uaa_admin_client_secret" ;;
+      6) UAA_TARGET="https://192.168.99.154:8443" ; UAA_USER="uaa_admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/bosh-remote-r4/uaa_admin_client_secret" ;;
+      7) UAA_TARGET="https://uaa.${OPS_DOMAIN}" ; UAA_USER="admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/micro-bosh/ops-routing/uaa_admin_client_secret" ;;
+      8) UAA_TARGET="https://uaa.${SYSTEM_DOMAIN}" ; UAA_USER="admin" ; getCredhubValue "ADMIN_CLIENT_SECRET" "/bosh-master/cf/uaa_admin_client_secret" ;;
       *) flag=0 ; clear ;;
     esac
   done