From 0376efac2c8cb923d05af58c69a80ca23a4aa9d4 Mon Sep 17 00:00:00 2001
From: Clenimar Filemon <clenimar.filemon@gmail.com>
Date: Mon, 30 May 2016 18:59:31 -0300
Subject: [PATCH] Remove hard-coded keystone version from setup

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
---
 devstack/upgrade/upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh
index 6ffa44e320..5d980571e2 100755
--- a/devstack/upgrade/upgrade.sh
+++ b/devstack/upgrade/upgrade.sh
@@ -86,7 +86,7 @@ function init_ironic {
 }
 
 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"
     fi
 }