openstack/rally-openstack
Code Issues Proposed changes

Merge "Create deployment conf depend on identity version"

Browse Source
This commit is contained in:
Jenkins 2016-06-08 21:23:08 +00:00 committed by Gerrit Code Review
commit 6c34280f4d
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
devstack/lib/rally
View File

@ -45,6 +45,8 @@ RALLY_ADD_DEPLOYMENT=$(trueorfalse True $RALLY_ADD_DEPLOYMENT)
#
# _create_deployment_config filename
function _create_deployment_config() {
if [[ "$IDENTITY_API_VERSION" == 2.0 ]]
then
cat >$1 <<EOF
{
"type": "ExistingCloud",
@ -53,10 +55,28 @@ function _create_deployment_config() {
"admin": {
"username": "admin",
"password": "$ADMIN_PASSWORD",
"tenant_name": "admin"
"tenant_name": "admin",
}
}
EOF
fi
if [[ "$IDENTITY_API_VERSION" == 3 ]]
then
cat >$1 <<EOF
{
"type": "ExistingCloud",
"auth_url": "$KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/v$IDENTITY_API_VERSION",
"region_name": "$REGION_NAME",
"admin": {
"username": "admin",
"password": "$ADMIN_PASSWORD",
"tenant_name": "admin",
"user_domain_name": "Default",
"project_domain_name": "Default"
}
}
EOF
fi
}
# install_rally() - Collect source and prepare