From 0c2e96d87eed2105794fddb965e92ba1653fb12e Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Fri, 30 Mar 2018 16:36:43 -0400
Subject: [PATCH] Helm-Toolkit: Reduce delta between OSH and OSH-Infra

This PS reduces the delta between OSH and OSH-Infra helm toolkits.

Change-Id: I00a684b3801a0990550f55c8facb0252fddb67f2
---
 .../templates/scripts/_ks-user.sh.tpl         | 11 +++--
 .../templates/scripts/_rally_test.sh.tpl      | 42 +++++++++++++++----
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
index 1b61371bd..72b81fc71 100644
--- a/helm-toolkit/templates/scripts/_ks-user.sh.tpl
+++ b/helm-toolkit/templates/scripts/_ks-user.sh.tpl
@@ -76,6 +76,10 @@ openstack user set --password="${SERVICE_OS_PASSWORD}" "${USER_ID}"
 openstack user show "${USER_ID}"
 
 function ks_assign_user_role () {
+  # Get user role
+  USER_ROLE_ID=$(openstack role create --or-show -f value -c id \
+      "${SERVICE_OS_ROLE}");
+
   # Manage user role assignment
   openstack role add \
       --user="${USER_ID}" \
@@ -92,9 +96,10 @@ function ks_assign_user_role () {
 }
 
 # Manage user service role
-export USER_ROLE_ID=$(openstack role create --or-show -f value -c id \
-    "${SERVICE_OS_ROLE}");
-ks_assign_user_role
+IFS=','
+for SERVICE_OS_ROLE in ${SERVICE_OS_ROLES}; do
+  ks_assign_user_role
+done
 
 # Manage user member role
 : ${MEMBER_OS_ROLE:="_member_"}
diff --git a/helm-toolkit/templates/scripts/_rally_test.sh.tpl b/helm-toolkit/templates/scripts/_rally_test.sh.tpl
index 5da4a0fbf..76e6bb3c4 100644
--- a/helm-toolkit/templates/scripts/_rally_test.sh.tpl
+++ b/helm-toolkit/templates/scripts/_rally_test.sh.tpl
@@ -19,19 +19,45 @@ limitations under the License.
 set -ex
 {{- $rallyTests := index . 0 }}
 
-: ${RALLY_ENV_NAME:="openstack-helm"}
+: "${RALLY_ENV_NAME:="openstack-helm"}"
+
 rally-manage db create
-rally deployment create --fromenv --name ${RALLY_ENV_NAME}
-rally deployment use ${RALLY_ENV_NAME}
+cat > /tmp/rally-config.json << EOF
+{
+    "type": "ExistingCloud",
+    "auth_url": "${OS_AUTH_URL}",
+    "region_name": "${OS_REGION_NAME}",
+    "endpoint_type": "public",
+    "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}"
+        }
+    ]
+}
+EOF
+rally deployment create --file /tmp/rally-config.json --name "${RALLY_ENV_NAME}"
+rm -f /tmp/rally-config.json
+rally deployment use "${RALLY_ENV_NAME}"
 rally deployment check
 {{- if $rallyTests.run_tempest }}
-rally verify create-verifier --name ${RALLY_ENV_NAME}-tempest --type tempest
-SERVICE_TYPE=$(rally deployment check | grep ${RALLY_ENV_NAME} | awk -F \| '{print $3}' | tr -d ' ' | tr -d '\n')
-rally verify start --pattern tempest.api.$SERVICE_TYPE*
-rally verify delete-verifier --id ${RALLY_ENV_NAME}-tempest --force
+rally verify create-verifier --name "${RALLY_ENV_NAME}-tempest" --type tempest
+SERVICE_TYPE="$(rally deployment check | grep "${RALLY_ENV_NAME}" | awk -F \| '{print $3}' | tr -d ' ' | tr -d '\n')"
+rally verify start --pattern "tempest.api.${SERVICE_TYPE}*"
+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 deployment destroy --deployment "${RALLY_ENV_NAME}"
 rally task sla-check
 {{- end }}