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: Ibc217400d16ce06f9943d69e2305e46762ec2662
This commit is contained in:
Jesse Pretorius 2018-07-27 13:41:28 +01:00 committed by Jesse Pretorius (odyssey4me)
parent ed2595a0d4
commit 2bf14e2122
3 changed files with 7 additions and 25 deletions

View File

@ -5,11 +5,7 @@
- { role: "os_magnum", tags: [ "os-magnum" ] }
vars:
magnum_galera_address: "{{ internal_lb_vip_address }}"
magnum_galera_database_name: magnum_service
magnum_galera_user: magnum
magnum_oslomsg_rpc_userid: magnum
magnum_oslomsg_rpc_vhost: /magnum
magnum_oslomsg_notify_userid: magnum
magnum_oslomsg_notify_vhost: /magnum
ansible_hostname: "{{ container_name }}"
is_metal: "{{ properties.is_metal|default(false) }}"
magnum_galera_password: secrete
magnum_service_password: secrete
magnum_oslomsg_rpc_password: secrete
magnum_trustee_password: secrete

View File

@ -1,16 +1,10 @@
---
magnum_developer_mode: true
magnum_galera_password: secrete
magnum_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
magnum_galera_address: "{{ test_galera_host }}"
magnum_service_password: secrete
magnum_oslomsg_rpc_password: secrete
magnum_oslomsg_notify_password: secrete
magnum_trustee_password: secrete
magnum_oslomsg_rpc_servers: "{{ rabbitmq_servers }}"
magnum_oslomsg_rpc_userid: magnum
magnum_oslomsg_rpc_vhost: /magnum
magnum_galera_database_name: magnum_service
magnum_galera_user: magnum
# TODO: Install and use barbican for certificate management
# Make sure we use x509keypair for now

View File

@ -16,15 +16,7 @@
- name: Install magnum server
hosts: magnum_all
user: root
pre_tasks:
- include: common/ensure-oslomsg.yml
rpc_vhost: "{{ magnum_oslomsg_rpc_vhost }}"
rpc_user: "{{ magnum_oslomsg_rpc_userid }}"
rpc_password: "{{ magnum_oslomsg_rpc_password }}"
notify_vhost: "{{ magnum_oslomsg_notify_vhost }}"
notify_user: "{{ magnum_oslomsg_notify_userid }}"
notify_password: "{{ magnum_oslomsg_notify_password }}"
roles:
- role: "os_magnum"
vars_files:
- common/test-vars.yml
roles:
- role: "os_magnum"