From b7e77dfea06c96bcc68bbd4a21d743d2e91d102e Mon Sep 17 00:00:00 2001
From: Pete Birley <petebirley@gmail.com>
Date: Wed, 7 Nov 2018 19:31:49 +0000
Subject: [PATCH] Revert "Fix rally deployment config to rally 1.2.0"

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
---
 .../templates/scripts/_rally_test.sh.tpl      | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/helm-toolkit/templates/scripts/_rally_test.sh.tpl b/helm-toolkit/templates/scripts/_rally_test.sh.tpl
index 0157c5a72..368f77e9f 100644
--- a/helm-toolkit/templates/scripts/_rally_test.sh.tpl
+++ b/helm-toolkit/templates/scripts/_rally_test.sh.tpl
@@ -22,34 +22,29 @@ set -ex
 : "${RALLY_ENV_NAME:="openstack-helm"}"
 : "${OS_INTERFACE:="public"}"
 
-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
-
+rally-manage db create
 cat > /tmp/rally-config.json << EOF
 {
-    "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": ""
-    }
+    "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}"
+        }
+    ]
 }
 EOF
 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 }}
 rally task validate /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 task sla-check
 {{- end }}