diff options
| author | Zuul <zuul@review.opendev.org> | 2022-08-10 13:58:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-08-10 13:58:58 +0000 |
| commit | 3e5369db541c60df6d5cddccc20b04f50a3d45ad (patch) | |
| tree | 211168aafc5da11676390f65481d4276511537bd | |
| parent | 05194e76180e63d61f54c77af41238fd6927a95d (diff) | |
| parent | 8a84479778190b5c9824a591f9c330c0001b9e8b (diff) | |
| download | kolla-3e5369db541c60df6d5cddccc20b04f50a3d45ad.tar.gz kolla-3e5369db541c60df6d5cddccc20b04f50a3d45ad.zip | |
Merge "Remove Keystone admin endpoint"
| -rw-r--r-- | docker/keystone/keystone/keystone_bootstrap.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/keystone/keystone/keystone_bootstrap.sh b/docker/keystone/keystone/keystone_bootstrap.sh index 15a79c3eb..fbd38d844 100644 --- a/docker/keystone/keystone/keystone_bootstrap.sh +++ b/docker/keystone/keystone/keystone_bootstrap.sh @@ -16,7 +16,7 @@ if [ -z "$PASSWORD" ]; then fi PROJECT=$3 ROLE=$4 -ADMIN_URL=$5 +# ADMIN_URL=$5 INTERNAL_URL=$6 PUBLIC_URL=$7 REGION=$8 @@ -35,7 +35,7 @@ changed="false" # which prevent JSON decoding. # NOTE(yoctozepto): also apply sed to escape double quotation marks # and backslashes -keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-admin-url "${ADMIN_URL}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1 | cat -v | sed 's/\\/\\\\/g' | sed 's/"/\\"/g') +keystone_bootstrap=$(keystone-manage bootstrap --bootstrap-username "${USERNAME}" --bootstrap-password "${PASSWORD}" --bootstrap-project-name "${PROJECT}" --bootstrap-role-name "${ROLE}" --bootstrap-internal-url "${INTERNAL_URL}" --bootstrap-public-url "${PUBLIC_URL}" --bootstrap-service-name "keystone" --bootstrap-region-id "${REGION}" 2>&1 | cat -v | sed 's/\\/\\\\/g' | sed 's/"/\\"/g') if [[ $? != 0 ]]; then fail_json "${keystone_bootstrap}" fi @@ -47,7 +47,6 @@ changed=$(echo "${keystone_bootstrap}" | awk ' /Role '"${ROLE}"' exists, skipping creation./ || /User '"${USERNAME}"' already has '"${ROLE}"' on '"${PROJECT}"'./ || /Region '"${REGION}"' exists, skipping creation./ || - /Skipping admin endpoint as already created/ || /Skipping internal endpoint as already created/ || /Skipping public endpoint as already created/ {count++} END { |