openstack/ironic
Code Issues Proposed changes

Remove hard-coded keystone version from setup

Browse Source 
Commit Id229617ec5cf2820c1033fd2c34fc160a75c46d6 recently introduced a
hard-coded identity API version in the setup script. This patch switches
the /v2.0/ to /v$IDENTITY_API_VERSION/ so we can work when v2 is
disabled as well.

Change-Id: Ib6fd666930bf45170f69d5f64ccadf617899f7c7
This commit is contained in:
Clenimar Filemon
2016-05-30 18:59:31 -03:00
parent db9d497505
commit 0376efac2c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/upgrade/upgrade.sh
View File

@@ -86,7 +86,7 @@ function init_ironic {
} }
function wait_for_keystone { function wait_for_keystone {
if ! wait_for_service $SERVICE_TIMEOUT ${KEYSTONE_AUTH_URI}/v2.0/; then if ! wait_for_service $SERVICE_TIMEOUT ${KEYSTONE_AUTH_URI}/v$IDENTITY_API_VERSION/; then
die $LINENO "keystone did not start" die $LINENO "keystone did not start"
fi fi
} }