Execute tempest using updated method

The old method of executing tempest via run_tempest.sh from
the root of the git clone has been deprecated and will soon
be removed.

Change-Id: I9779b4463d6882e28be305ba03ded703b15f51b0

tests/os_sahara-overrides.yml

@@ -13,7 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+tempest_run: yes
+
 tempest_plugins:
   - name: sahara-tests
     repo: https://git.openstack.org/openstack/sahara-tests
     branch: master
+
+tempest_test_whitelist:
+  - sahara_tempest_plugin.tests.api

tests/test-sahara-functional.yml

@@ -1,24 +0,0 @@
----
-# 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: Playbook for functional testing of sahara
-  hosts: utility_all
-  user: root
-  gather_facts: false
-  tasks:
-    - name: Run tempest
-      shell: |
-        . {{ tempest_venv_bin }}/activate
-        {{ tempest_venv_bin | dirname }}/run_tempest.sh --no-virtual-env --serial sahara_tempest_plugin.tests.api
-  vars_files:
-    - common/test-vars.yml

tests/test.yml

@@ -28,8 +28,5 @@
 # Install Sahara
 - include: common/test-install-sahara.yml
 
-# Install Tempest
+# Install and execute Tempest
 - include: common/test-install-tempest.yml
-
-# Test Sahara
-- include: test-sahara-functional.yml