From aaa29f616d8bd7890cce949a1f5d4d08bd82d927 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Fri, 7 Apr 2017 16:41:39 +0100
Subject: [PATCH] Use central testing repo Horizon plays

These were moved to allow work on translations testing infrastructure,
so we should utilise the central tests repo for horizon.

Change-Id: I32a41fb8bc0b5e584f05a79adc3cf90ce6e1c49c
---
 tests/os_horizon-overrides.yml | 24 +------------
 tests/test-install-horizon.yml | 65 ----------------------------------
 tests/test.yml                 |  2 +-
 3 files changed, 2 insertions(+), 89 deletions(-)
 delete mode 100644 tests/test-install-horizon.yml

diff --git a/tests/os_horizon-overrides.yml b/tests/os_horizon-overrides.yml
index b740a576..48828543 100644
--- a/tests/os_horizon-overrides.yml
+++ b/tests/os_horizon-overrides.yml
@@ -13,33 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-horizon_developer_mode: true
-horizon_venv_tag: "testing"
-horizon_git_install_branch: master
-horizon_requirements_git_install_branch: master
-horizon_galera_address: "{{ test_galera_host }}"
-horizon_galera_database: dash
-horizon_galera_user: dash
-horizon_rabbitmq_password: "secrete"
-horizon_rabbitmq_userid: horizon
-horizon_rabbitmq_vhost: /horizon
-horizon_container_mysql_password: "SuperSecrete"
-horizon_secret_key: "SuperSecreteHorizonKey"
-horizon_external_ssl: False
-
-# User for nova service registration required for Horizon tempest tests
+# The horizon role needs to create the nova endpoint
 nova_service_name: nova
 nova_service_type: compute
 nova_service_description: "Nova Compute Service"
 nova_service_port: 8774
-nova_service_proto: http
-nova_service_region: RegionOne
-nova_service_publicuri: "{{ nova_service_proto }}://{{ external_lb_vip_address }}:{{ nova_service_port }}"
-nova_service_publicurl: "{{ nova_service_publicuri }}/v2.1/%(tenant_id)s"
-nova_service_adminuri: "{{ nova_service_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
-nova_service_adminurl: "{{ nova_service_adminuri }}/v2.1/%(tenant_id)s"
-nova_service_internaluri: "{{ nova_service_proto }}://{{ internal_lb_vip_address }}:{{ nova_service_port }}"
-nova_service_internalurl: "{{ nova_service_internaluri }}/v2.1/%(tenant_id)s"
 
 tempest_run: yes
 tempest_dashboard_login_url: "https://{{ hostvars[groups['horizon_all'][0]]['ansible_host'] }}/auth/login/"
diff --git a/tests/test-install-horizon.yml b/tests/test-install-horizon.yml
deleted file mode 100644
index 6e27f25d..00000000
--- a/tests/test-install-horizon.yml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-# 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: Playbook for deploying horizon
-  hosts: horizon_all
-  user: root
-  gather_facts: true
-  pre_tasks:
-    - include: common/create-grant-db.yml
-      db_name: "{{ horizon_galera_database }}"
-      db_password: "{{ horizon_container_mysql_password }}"
-  post_tasks:
-    - name: Ensure nova service
-      keystone:
-        command: "ensure_service"
-        endpoint: "{{ keystone_service_adminurl }}"
-        login_user: "{{ keystone_admin_user_name }}"
-        login_password: "{{ keystone_auth_admin_password }}"
-        login_project_name: "{{ keystone_admin_tenant_name }}"
-        service_name: "{{ nova_service_name }}"
-        service_type: "{{ nova_service_type }}"
-        description: "{{ nova_service_description }}"
-        insecure: "{{ keystone_service_adminuri_insecure }}"
-      register: add_service
-      until: add_service|success
-      retries: 5
-      delay: 2
-    - name: Ensure nova endpoint
-      keystone:
-        command: "ensure_endpoint"
-        endpoint: "{{ keystone_service_adminurl }}"
-        login_user: "{{ keystone_admin_user_name }}"
-        login_password: "{{ keystone_auth_admin_password }}"
-        login_project_name: "{{ keystone_admin_tenant_name }}"
-        region_name: "{{ nova_service_region }}"
-        service_name: "{{ nova_service_name }}"
-        service_type: "{{ nova_service_type }}"
-        insecure: "{{ keystone_service_adminuri_insecure }}"
-        endpoint_list:
-          - url: "{{ nova_service_publicurl }}"
-            interface: "public"
-          - url: "{{ nova_service_internalurl }}"
-            interface: "internal"
-          - url: "{{ nova_service_adminurl }}"
-            interface: "admin"
-      register: add_service
-      until: add_service|success
-      retries: 5
-      delay: 10
-  roles:
-    - role: "{{ horizon_rolename | default('os_horizon') }}"
-  vars_files:
-    - common/test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index 90916080..ab04a669 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -23,7 +23,7 @@
 - include: common/test-install-keystone.yml
 
 # Install Horizon
-- include: test-install-horizon.yml
+- include: common/test-install-horizon.yml
 
 # Install and execute Tempest
 - include: common/test-install-tempest.yml