Merge "Move Sahara test playbook into role"

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

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"

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