Merge "Fix ceilometer testing"

This commit is contained in:
Jenkins 2016-07-06 19:56:09 +00:00 committed by Gerrit Code Review
commit 5633dab207

View File

@ -27,7 +27,7 @@
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
if [ "x{network}" = "x-neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1
@ -67,7 +67,7 @@
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
function post_test_hook {{
@ -113,7 +113,7 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
if [ "{special}" == "-identity-v3-only" ] ; then
export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
fi
function post_test_hook {{