openstack
/
rally
Code Issues Proposed changes

Merge "[ci] print available images, volumes, nets"

This commit is contained in:
Jenkins 2017-04-18 14:14:05 +00:00 committed by Gerrit Code Review
parent bdb3559600 0236d64f2b
commit f64460817d
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/ci/rally_gate_functions.sh
View File

@ -34,12 +34,26 @@ function setUp () {
source ~/.rally/openrc admin admin
if [[ $(rally deployment config) == *"project_name"* ]]; then
export OS_IDENTITY_API_VERSION=3
else
export OS_IDENTITY_API_VERSION="2.0"
fi
OPENSTACK_SERVICES=$(openstack service list)
if [[ $OPENSTACK_SERVICES == *"glance"* ]]; then
openstack image list
fi
if [[ $OPENSTACK_SERVICES == *"cinder"* ]]; then
openstack volume list --all-projects
fi
if [[ $OPENSTACK_SERVICES == *"neutron"* ]]; then
openstack network list
fi
# NOTE(ikhudoshyn): Create additional users and register a new env
# so that we could run scenarios using 'existing_users' context
if [ "$DEVSTACK_GATE_PREPOPULATE_USERS" = "1" ]; then
# NOTE(andreykurilin): let's hardcode version, since we already
# hardcoded arguments for users...
export OS_IDENTITY_API_VERSION=3
openstack --version
openstack project create rally-test-project-1
@ -136,4 +150,4 @@ function run () {
| gzip > rally-plot/resources_diff.txt.gz
exit $retval
}
}