diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-31 12:15:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-31 12:15:23 +0000 |
| commit | 904f346d976c1a9e69e9cb6809b7d972bad33a1e (patch) | |
| tree | bbf76e7cde64e1240dfac0e6986c899e66c3e4bc | |
| parent | ec101532fa66b60c7fe1a1b850ac70a465441c9f (diff) | |
| parent | e5748194b2013cf08bf4dfc78b8559721e4b8a96 (diff) | |
| download | kolla-904f346d976c1a9e69e9cb6809b7d972bad33a1e.tar.gz kolla-904f346d976c1a9e69e9cb6809b7d972bad33a1e.zip | |
Merge "Make keystone_bootstrap accept no ADMIN_URL too"
| -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}' |