From 17664147991b75f89e52d7ea63ea970705218647 Mon Sep 17 00:00:00 2001
From: "Donovan Francesco (drifterza)" <donovan.francesco@gmail.com>
Date: Thu, 17 Nov 2016 14:36:29 +0200
Subject: [PATCH] Using updated tempest method for keystone.

Change-Id: I51c847ea987eef807e5d44a497410249a143b6bd
---
 .gitignore                         |  6 ++----
 tests/os_keystone-overrides.yml    | 27 +++++++++++++++++++++++++++
 tests/test-keystone-functional.yml | 16 ----------------
 tests/test.yml                     |  2 +-
 4 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 tests/os_keystone-overrides.yml

diff --git a/.gitignore b/.gitignore
index 21adf3c5..6079b40f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,10 +62,8 @@ releasenotes/build
 
 # Test temp files
 tests/plugins
-tests/playbooks
-tests/test.retry
+tests/common
+tests/*.retry
 
 # Vagrant artifacts
 .vagrant
-
-
diff --git a/tests/os_keystone-overrides.yml b/tests/os_keystone-overrides.yml
new file mode 100644
index 00000000..b1643056
--- /dev/null
+++ b/tests/os_keystone-overrides.yml
@@ -0,0 +1,27 @@
+---
+# Copyright 2016 Internet Solutions (Pty) Ltd
+#
+# 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.
+#
+# (c) 2016 Donovan Francesco <donovan.francesco@is.co.za>
+# (c) 2016 Paul Stevens <paul.stevens@is.co.za>
+
+tempest_run: yes
+
+tempest_plugins:
+  - name: keystone
+    repo: https://git.openstack.org/openstack/keystone
+    branch: master
+
+tempest_test_whitelist:
+  - keystone_tempest_plugin.tests.api.identity*
diff --git a/tests/test-keystone-functional.yml b/tests/test-keystone-functional.yml
index 9fdf02b8..b025dc3f 100644
--- a/tests/test-keystone-functional.yml
+++ b/tests/test-keystone-functional.yml
@@ -71,19 +71,3 @@
 
   vars_files:
     - common/test-vars.yml
-
-# Run tempest identity tests on one keystone host.
-- name: Playbook for functional testing keystone
-  hosts: keystone_all[0]
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Run tempest
-      shell: |
-        . {{ tempest_venv_bin }}/activate
-        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env ${RUN_TEMPEST_OPTS} '^tempest.api.identity.*'
-      environment:
-        RUN_TEMPEST_OPTS: "--serial"
-
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index 569a7031..d506503d 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -28,7 +28,7 @@
 # Install Keystone
 - include: common/test-install-keystone.yml
 
-# Install Tempest
+# Install and execute Tempest
 - include: common/test-install-tempest.yml
 
 # Test Keystone