openstack/shade
Code Issues Proposed changes

Consume /etc/openstack/clouds.yaml

Browse Source 
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
This commit is contained in:
Monty Taylor 2015-10-30 11:38:26 +09:00
parent caf673f963
commit f826d93ad0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shade/tests/functional/hooks/post_test_hook.sh
View File

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