openstack/python-novaclient
Code Issues Proposed changes

Merge "Rely on devstack for clouds.yaml"

Browse Source
This commit is contained in:
Jenkins 2015-10-20 23:52:59 +00:00 committed by Gerrit Code Review
commit 095d72f652
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
novaclient/tests/functional/hooks/post_test_hook.sh
View File

@ -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