Merge "Fix keystone bootstrap error message display"

This commit is contained in:
Zuul 2019-12-09 14:11:55 +00:00 committed by Gerrit Code Review
commit 881edf3793
2 changed files with 11 additions and 1 deletions

View File

@ -1,5 +1,7 @@
#!/bin/bash
set -o pipefail
# NOTE(SamYaple): Kolla needs to wraps `keystone-manage bootstrap` to ensure
# any change is reported correctly for idempotency. This script will exit with
# valid json that can be parsed with information about if the task has failed
@ -29,7 +31,9 @@ function exit_json {
}
changed="false"
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)
# 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)
if [[ $? != 0 ]]; then
fail_json "${keystone_bootstrap}"
fi

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with keystone bootstrap where an error message emitted by
the ``keystone-manage bootstrap`` command is hidden. See `bug 1855701
<https://bugs.launchpad.net/kolla-ansible/+bug/1855701>`__ for details.