diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-08-26 21:25:53 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2022-08-26 21:31:29 +0200 |
| commit | e5748194b2013cf08bf4dfc78b8559721e4b8a96 (patch) | |
| tree | 4b0726612ea0e932dabb733c0f018d625651ae43 | |
| parent | 91c2cc0d8d4caf8fa6567b95d8f7e7b4fc4dd443 (diff) | |
| download | kolla-e5748194b2013cf08bf4dfc78b8559721e4b8a96.tar.gz kolla-e5748194b2013cf08bf4dfc78b8559721e4b8a96.zip | |
Make keystone_bootstrap accept no ADMIN_URL too
To be able to drop the dummy arg.
Change-Id: Ibcc3e6b4e6015604c218e384d87de7b9e9aed4c8
| -rw-r--r-- | docker/keystone/keystone/keystone_bootstrap.sh | 16 |
1 files 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}' |