openstack/openstack-helm-infra
Code Issues Proposed changes

Revert "Fix rally deployment config to rally 1.2.0"

Browse Source 
This reverts commit 5c2859c3e9026e464bf0c35b591aaae810ff2a1c.

This commit breaks the ability to declare users to use with rally/helm test - and needs to be refactored to match the commit message's intent.

Change-Id: I2bc66ef40694c277058b4324b8a3528f4f25d1d1
This commit is contained in:
Pete Birley 2018-11-07 19:31:49 +00:00
parent 5c2859c3e9
commit b7e77dfea0
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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