From f826d93ad0e9f7a92e37afaba1feb93d6721125b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 30 Oct 2015 11:38:26 +0900 Subject: [PATCH] Consume /etc/openstack/clouds.yaml devstack write out clouds.yaml to /etc. Use that, rather than ~jenkins. Also, remove the jenkins one since we edit the file. Change-Id: Ie89fb49e760855c5eec46e44ea2f947c4852b949 --- shade/tests/functional/hooks/post_test_hook.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shade/tests/functional/hooks/post_test_hook.sh b/shade/tests/functional/hooks/post_test_hook.sh index df9557451..a0e064ebb 100755 --- a/shade/tests/functional/hooks/post_test_hook.sh +++ b/shade/tests/functional/hooks/post_test_hook.sh @@ -17,15 +17,16 @@ export SHADE_DIR="$BASE/new/shade" cd $SHADE_DIR sudo chown -R jenkins:stack $SHADE_DIR -CLOUDS_YAML=~jenkins/.config/openstack/clouds.yaml +sudo rm -f ~jenkins/.config/openstack/clouds.yaml +CLOUDS_YAML=/etc/openstack/clouds.yaml # Devstack runs both keystone v2 and v3. An environment variable is set # within the shade keystone v2 job that tells us which version we should # test against. if [ ${SHADE_USE_KEYSTONE_V2:-0} -eq 1 ] then - sed -ie "s/identity_api_version: '3'/identity_api_version: '2.0'/g" $CLOUDS_YAML - sed -ie '/^.*domain_id.*$/d' $CLOUDS_YAML + sudo sed -ie "s/identity_api_version: '3'/identity_api_version: '2.0'/g" $CLOUDS_YAML + sudo sed -ie '/^.*domain_id.*$/d' $CLOUDS_YAML fi echo "Running shade functional test suite"