Browse Source

Ensure proper JSON in keystone bootstrap

This fixes the issue when keystone-manage output included
backslashes and/or double quotation marks which broke JSON string.

Change-Id: Ifae18c407210c12745d29fc4c95dca69aeafe6a8
Closes-bug: #1866017
changes/86/711186/1
Radosław Piliszek 1 year ago
parent
commit
33d184a731
  1. 4
      docker/keystone/keystone/keystone_bootstrap.sh
  2. 5
      releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml

4
docker/keystone/keystone/keystone_bootstrap.sh

@ -33,7 +33,9 @@ function exit_json {
changed="false"
# NOTE(mgoddard): pipe through cat -v to remove unprintable control characters
# which prevent JSON decoding.
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)
# 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')
if [[ $? != 0 ]]; then
fail_json "${keystone_bootstrap}"
fi

5
releasenotes/notes/bug-1866017-9e31ddbfca9fd0f4.yaml

@ -0,0 +1,5 @@
---
fixes:
- |
Keystone bootstrap could produce invalid json.
`LP#1866017 <https://launchpad.net/bugs/1866017>`__
Loading…
Cancel
Save