From 28f1b7a6ea72486c163fa441714e6966e75cc9e1 Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Fri, 9 Dec 2016 10:40:42 -0800
Subject: [PATCH] Use common heat test playbook and vars

Use the common heat playbook and variables included in the centralized
tests repo.

Change-Id: I008e1a7a864151704d4220465fcff8856059de1f
---
 tests/magnum-test-vars.yml  | 19 -------------------
 tests/test-install-heat.yml | 32 --------------------------------
 tests/test.yml              |  2 +-
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 tests/test-install-heat.yml

diff --git a/tests/magnum-test-vars.yml b/tests/magnum-test-vars.yml
index 0006db9..53b581a 100644
--- a/tests/magnum-test-vars.yml
+++ b/tests/magnum-test-vars.yml
@@ -25,25 +25,6 @@ magnum_glance_images:
     distro: fedora-atomic
     checksum: "sha1:dab00359cfa5cd393f0a6044f77c4a78c6167a47"
 
-heat_venv_tag: "testing"
-heat_developer_mode: true
-heat_git_install_branch: master
-heat_requirements_git_install_branch: master
-heat_service_password: secrete
-heat_stack_domain_admin_password: secrete
-heat_auth_encryption_key: 32characterslongboguskeyvaluefoo
-heat_galera_password: "SuperSecrete"
-heat_container_mysql_password: "SuperSecrete"
-heat_galera_address: 10.1.1.101
-heat_galera_user: heat
-heat_galera_database: heat
-heat_rabbitmq_servers: 10.1.1.101
-heat_rabbitmq_use_ssl: false
-heat_rabbitmq_port: 5672
-heat_rabbitmq_password: "secrete"
-heat_rabbitmq_userid: heat
-heat_rabbitmq_vhost: /heat
-
 haproxy_default_services:
   - service:
       haproxy_service_name: galera
diff --git a/tests/test-install-heat.yml b/tests/test-install-heat.yml
deleted file mode 100644
index de42a47..0000000
--- a/tests/test-install-heat.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-# Copyright 2016, 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: Deploy heat
-  hosts: heat_all
-  user: root
-  gather_facts: true
-  pre_tasks:
-    - include: common/ensure-rabbitmq.yml
-      vhost_name: "{{ heat_rabbitmq_vhost }}"
-      user_name: "{{ heat_rabbitmq_userid }}"
-      user_password: "{{ heat_rabbitmq_password }}"
-    - include: common/create-grant-db.yml
-      db_name: "{{ heat_galera_database }}"
-      db_password: "{{ heat_galera_password }}"
-  roles:
-    - role: os_heat
-  vars_files:
-    - common/test-vars.yml
-    - magnum-test-vars.yml
diff --git a/tests/test.yml b/tests/test.yml
index f3dd646..e8b5442 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -48,7 +48,7 @@
 - include: common/test-install-neutron.yml
 
 # Install heat
-- include: test-install-heat.yml
+- include: common/test-install-heat.yml
 
 # Install magnum
 - include: test-install-magnum.yml