From ef7732601360f798def911d2fc6718f0cea2bd9c Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Wed, 18 Jul 2018 02:52:59 +0100
Subject: [PATCH] Move Sahara test playbook into role

The Sahara playbook/vars are not used by any other
role, so we move them into the sahara role to allow
changes to be made to it without requiring an extra
repo change.

Depends-On: https://review.openstack.org/583428
Change-Id: Iad7bd929102a20c6a1620a12f217a6b040ba955c
---
 tests/os_sahara-overrides.yml |  6 ++++++
 tests/test-install-sahara.yml | 24 ++++++++++++++++++++++++
 tests/test.yml                |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-install-sahara.yml

diff --git a/tests/os_sahara-overrides.yml b/tests/os_sahara-overrides.yml
index a3cc4fc..7d625bf 100644
--- a/tests/os_sahara-overrides.yml
+++ b/tests/os_sahara-overrides.yml
@@ -22,3 +22,9 @@ tempest_plugins:
 
 tempest_test_whitelist:
   - sahara_tempest_plugin.tests.api
+
+sahara_developer_mode: true
+sahara_service_password: "secrete"
+sahara_container_mysql_password: "SuperSecrete"
+sahara_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
+sahara_wsgi_processes: 2
diff --git a/tests/test-install-sahara.yml b/tests/test-install-sahara.yml
new file mode 100644
index 0000000..016ae4e
--- /dev/null
+++ b/tests/test-install-sahara.yml
@@ -0,0 +1,24 @@
+---
+# Copyright 2015, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Install Sahara
+  hosts: sahara_all
+  remote_user: root
+  gather_facts: true
+  any_errors_fatal: true
+  vars_files:
+    - common/test-vars.yml
+  roles:
+    - role: "os_sahara"
diff --git a/tests/test.yml b/tests/test.yml
index 0287f09..00a2734 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -26,7 +26,7 @@
 - import_playbook: common/test-install-nova.yml
 
 # Install Sahara
-- import_playbook: common/test-install-sahara.yml
+- import_playbook: test-install-sahara.yml
 
 # Install and execute Tempest
 - import_playbook: common/test-install-tempest.yml