Merge "Revert "Actually use the service domain in V3 jobs""

This commit is contained in:
Jenkins 2016-05-12 16:29:05 +00:00 committed by Gerrit Code Review
commit 05898e5e4c
1 changed files with 1 additions and 1 deletions

View File

@ -1550,7 +1550,7 @@
export DEVSTACK_GATE_TEMPEST_FULL=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_DOMAIN_NAME=service"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"SERVICE_DOMAIN=service"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE