From e5748194b2013cf08bf4dfc78b8559721e4b8a96 Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Fri, 26 Aug 2022 21:25:53 +0200
Subject: Make keystone_bootstrap accept no ADMIN_URL too

To be able to drop the dummy arg.

Change-Id: Ibcc3e6b4e6015604c218e384d87de7b9e9aed4c8
---
 docker/keystone/keystone/keystone_bootstrap.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh
index fbd38d844..1b04d99b6 100644
--- a/docker/keystone/keystone/keystone_bootstrap.sh
+++ b/docker/keystone/keystone/keystone_bootstrap.sh
@@ -16,10 +16,18 @@ if [ -z "$PASSWORD" ]; then
 fi
 PROJECT=$3
 ROLE=$4
-# ADMIN_URL=$5
-INTERNAL_URL=$6
-PUBLIC_URL=$7
-REGION=$8
+if [ $# -ge 8 ]; then
+    # ignored ADMIN_URL compat mode
+    # ADMIN_URL=$5
+    INTERNAL_URL=$6
+    PUBLIC_URL=$7
+    REGION=$8
+else
+    # no ADMIN_URL modern mode
+    INTERNAL_URL=$5
+    PUBLIC_URL=$6
+    REGION=$7
+fi
 
 function fail_json {
     echo '{"failed": true, "msg": "'$1'", "changed": true}'
-- 
cgit v1.2.3