Add OS_AUTH_URL for Queens job

Pike and higher Opensatck Version uses a different Identify URL
This patch adds a condition to allow the OS_AUTH_URL to be set
for Queens jobs also.

Change-Id: I9131c0dd9f1b2c2e53332cb7d4bf1366b6949e8c
Signed-off-by: gvrangan <venkatrangang@hcl.com>

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 4af458b9bb41d2e3bfda6201600fd2d511dd6939..01ea5253d10bbb8045ecf4b76ca76b785d4bc601 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -895,7 +895,7 @@ if [ -z "${SUITES}" ]; then
     SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 fi
 
-if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then
+if [ "${OPENSTACK_BRANCH}" == "stable/pike" ] || [ "${OPENSTACK_BRANCH}" == "master" ]; then
    AUTH="http://${!CONTROLIP}/identity"
 else
    AUTH="http://${!CONTROLIP}:35357/v3"