From 727f1044bfe237a692adc77550cb27d9d53629c7 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 18 Oct 2015 13:16:17 -0400 Subject: [PATCH] Rely on devstack for clouds.yaml Rather than copying it ourselves, just consume the one that devstack is putting there for us. Change-Id: Ifb9f8a55e0eb342db55a3518c375ea79679ff076 --- novaclient/tests/functional/hooks/post_test_hook.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/novaclient/tests/functional/hooks/post_test_hook.sh b/novaclient/tests/functional/hooks/post_test_hook.sh index a00b42aa3..a07bd0c63 100755 --- a/novaclient/tests/functional/hooks/post_test_hook.sh +++ b/novaclient/tests/functional/hooks/post_test_hook.sh @@ -30,15 +30,11 @@ export NOVACLIENT_DIR="$BASE/new/python-novaclient" sudo chown -R jenkins:stack $NOVACLIENT_DIR -# ensure clouds.yaml exists -mkdir -p ~/.config/openstack -sudo cp -a ~stack/.config/openstack/clouds.yaml ~/.config/openstack # FIXME(melwitt): Currently, novaclient requires version in the # auth url in order to work and it doesn't support keystone v3. # Use v2.0 in the auth url in clouds.yaml to enable the functional # test job to work until novaclient is updated to support v3 -sudo sed -i -e 's/auth_url: \([^v ]\+\)\(\/v[0-9]\+\.\?[0-9]*\)\?$/auth_url: \1\/v2.0/g' ~/.config/openstack/clouds.yaml -sudo chown -R jenkins:stack ~/.config/openstack +sudo sed -i -e 's/auth_url: \([^v ]\+\)\(\/v[0-9]\+\.\?[0-9]*\)\?$/auth_url: \1\/v2.0/g' /etc/openstack/clouds.yaml # Go to the novaclient dir cd $NOVACLIENT_DIR