openstack
/
openstack-helm-infra
Code Issues Proposed changes

Fix rally deployment config to rally 1.2.0 

This PS fixed rally deployment config to latest format. After rally
refactoring, the deployment config format has been simplified, and the
old format is no longer available. The rally deployment config used by
the helm-toolkit also needs to be changed to support the latest rally.

Change-Id: I286f3c8e3ecd8cc7c26273fa7a1be7cc0bf31c4b
Related-Id: I380a976c0f48c4af0796c9d866fc8787025ce548
This commit is contained in:
Jaesang Lee 2018-10-04 07:04:23 +00:00
parent ff116a26fd
commit 5c2859c3e9
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
helm-toolkit/templates/scripts/_rally_test.sh.tpl
View File

@ -22,29 +22,34 @@ set -ex
: "${RALLY_ENV_NAME:="openstack-helm"}"
: "${OS_INTERFACE:="public"}"
rally-manage db create
function create_or_update_db () {
revisionResults=$(rally db revision)
if [ $revisionResults = "None" ]
then
rally db create
else
rally db upgrade
fi
}
create_or_update_db
cat > /tmp/rally-config.json << EOF
{
"type": "ExistingCloud",
"auth_url": "${OS_AUTH_URL}",
"region_name": "${OS_REGION_NAME}",
"endpoint_type": "${OS_INTERFACE}",
"admin": {
"username": "${OS_USERNAME}",
"password": "${OS_PASSWORD}",
"project_name": "${OS_PROJECT_NAME}",
"user_domain_name": "${OS_USER_DOMAIN_NAME}",
"project_domain_name": "${OS_PROJECT_DOMAIN_NAME}"
},
"users": [
{
"username": "${SERVICE_OS_USERNAME}",
"password": "${SERVICE_OS_PASSWORD}",
"project_name": "${SERVICE_OS_PROJECT_NAME}",
"user_domain_name": "${SERVICE_OS_USER_DOMAIN_NAME}",
"project_domain_name": "${SERVICE_OS_PROJECT_DOMAIN_NAME}"
}
]
"openstack": {
"auth_url": "${OS_AUTH_URL}",
"region_name": "${OS_REGION_NAME}",
"endpoint_type": "${OS_INTERFACE}",
"admin": {
"username": "${OS_USERNAME}",
"password": "${OS_PASSWORD}",
"user_domain_name": "${OS_USER_DOMAIN_NAME}",
"project_name": "${OS_PROJECT_NAME}",
"project_domain_name": "${OS_PROJECT_DOMAIN_NAME}"
},
"https_insecure": false,
"https_cacert": ""
}
}
EOF
rally deployment create --file /tmp/rally-config.json --name "${RALLY_ENV_NAME}"
@ -59,6 +64,6 @@ rally verify delete-verifier --id "${RALLY_ENV_NAME}-tempest" --force
{{- end }}
rally task validate /etc/rally/rally_tests.yaml
rally task start /etc/rally/rally_tests.yaml
rally deployment destroy --deployment "${RALLY_ENV_NAME}"
rally task sla-check
rally deployment destroy --deployment "${RALLY_ENV_NAME}"
{{- end }}