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: I4901fb117ac87ce37e2d07b1691f56820e7b0f70
This commit is contained in:
Jesse Pretorius 2018-07-27 13:29:14 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 4b41de0570
commit f64d1dce9b
3 changed files with 2 additions and 26 deletions

View File

@ -12,16 +12,7 @@
memcached_servers: 127.0.0.1
memcached_encryption_key: "some_key"
# Needed for aodh to locate and connect to Oslo.Messaging
aodh_oslomsg_rpc_transport: rabbit
aodh_oslomsg_rpc_password: "secrete"
aodh_oslomsg_rpc_servers: "10.100.100.2"
aodh_oslomsg_rpc_use_ssl: true
aodh_oslomsg_rpc_port: 5671
aodh_oslomsg_notify_transport: rabbit
aodh_oslomsg_notify_password: "secrete"
aodh_oslomsg_notify_servers: "10.100.100.2"
aodh_oslomsg_notify_use_ssl: true
aodh_oslomsg_notify_port: 5671
# Needed to setup the aodh service in Keystone
keystone_admin_user_name: admin
keystone_admin_tenant_name: admin

View File

@ -15,14 +15,7 @@
aodh_container_db_password: "secrete"
aodh_db_address: "{{ test_galera_host }}"
aodh_database_name: aodh
aodh_oslomsg_rpc_password: "secrete"
aodh_oslomsg_notify_password: "secrete"
aodh_oslomsg_rpc_userid: aodh
aodh_oslomsg_rpc_vhost: /aodh
aodh_oslomsg_notify_userid: aodh
aodh_oslomsg_notify_vhost: /aodh
aodh_venv_tag: "testing"
aodh_developer_mode: true
aodh_service_password: "secrete"
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}"

View File

@ -17,15 +17,7 @@
hosts: aodh_all
user: root
gather_facts: true
pre_tasks:
- include: common/ensure-oslomsg.yml
rpc_vhost: "{{ aodh_oslomsg_rpc_vhost }}"
rpc_user: "{{ aodh_oslomsg_rpc_userid }}"
rpc_password: "{{ aodh_oslomsg_rpc_password }}"
notify_vhost: "{{ aodh_oslomsg_notify_vhost }}"
notify_user: "{{ aodh_oslomsg_notify_userid }}"
notify_password: "{{ aodh_oslomsg_notify_password }}"
roles:
- role: "os_aodh"
vars_files:
- common/test-vars.yml
roles:
- role: "os_aodh"