From 5cebe63e354288548d23e1bff05b15e524c9e224 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Fri, 27 Jul 2018 13:45:21 +0100
Subject: [PATCH] Remove unnecessary MQ vhost/user creation tasks/vars

There is no record for why we implement the MQ vhost/user creation
outside of the role in the playbook, when we could do it inside the
role.

Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.

In this patch we remove the test vars and tasks which were duplicated
as they are no longer required.

Change-Id: Ife325741032bf6bcda7db6a1fa8b2cba216eeabd
---
 examples/playbook.yml        |  2 +-
 tests/os_trove-overrides.yml | 22 ----------------------
 tests/test-install-trove.yml | 12 ++----------
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/examples/playbook.yml b/examples/playbook.yml
index 16b50df..f0eb5d3 100755
--- a/examples/playbook.yml
+++ b/examples/playbook.yml
@@ -2,4 +2,4 @@
    hosts: all
    user: root
    roles:
-     - role: "openstack-ansible-os_trove"
+     - role: "os_trove"
diff --git a/tests/os_trove-overrides.yml b/tests/os_trove-overrides.yml
index 85bbfb1..706b3d3 100644
--- a/tests/os_trove-overrides.yml
+++ b/tests/os_trove-overrides.yml
@@ -18,34 +18,12 @@
 
 trove_developer_mode: True
 trove_galera_password: "secrete"
-trove_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
-trove_oslomsg_rpc_servers: "{ oslomsg_rpc_servers }}"
-trove_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
 trove_oslomsg_rpc_password: "secrete"
-trove_oslomsg_rpc_userid: trove
-trove_oslomsg_rpc_vhost: /trove
-trove_guest_oslomsg_rpc_servers: "{{ trove_oslomsg_rpc_servers }}"
-trove_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
-trove_oslomsg_notify_servers: "{ oslomsg_notify_servers }}"
-trove_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
-trove_oslomsg_notify_password: "secrete"
-trove_oslomsg_notify_userid: trove
-trove_oslomsg_notify_vhost: /trove
-trove_guest_oslomsg_notify_servers: "{{ trove_oslomsg_notify_servers }}"
 trove_guest_auth_url: "{{ trove_auth_url }}"
-trove_requirements_git_install_branch: master
 trove_service_password: "secrete"
 trove_admin_user_password: "secrete"
 trove_taskmanager_rpc_encr_key: bzH6y0SGmjuoY0FNSTptrhgieGXNDX6PIhvz
 trove_inst_rpc_key_encr_key: emYjgHFqfXNB1NGehAFIUeoyw4V4XwWHEaKP
-trove_service_project_domain_id: default
-trove_service_project_name: service
-trove_service_region: RegionOne
-trove_service_user_domain_id: default
-trove_service_user_name: trove
-trove_service_port: 8779
-trove_venv_tag: "untagged"
-trove_bin: "/openstack/venvs/trove-{{ trove_venv_tag }}/bin"
 neutron_service_port: 9696
 swift_proxy_port: 8080
 cinder_service_port: 8776
diff --git a/tests/test-install-trove.yml b/tests/test-install-trove.yml
index a8d0c1c..c914d2e 100644
--- a/tests/test-install-trove.yml
+++ b/tests/test-install-trove.yml
@@ -20,15 +20,7 @@
   hosts: trove_all
   user: root
   gather_facts: true
-  pre_tasks:
-    - include: common/ensure-oslomsg.yml
-      rpc_vhost: "{{ trove_oslomsg_rpc_vhost }}"
-      rpc_user: "{{ trove_oslomsg_rpc_userid }}"
-      rpc_password: "{{ trove_oslomsg_rpc_password }}"
-      notify_vhost: "{{ trove_oslomsg_notify_vhost }}"
-      notify_user: "{{ trove_oslomsg_notify_userid }}"
-      notify_password: "{{ trove_oslomsg_notify_password }}"
-  roles:
-    - role: "os_trove"
   vars_files:
     - common/test-vars.yml
+  roles:
+    - role: "os_trove"