openstack/openstack-ansible-tests
Code Issues Proposed changes

Merge "Move MQ vhost/user creation into role (glance)"

Browse Source
This commit is contained in:
Zuul 2018-07-05 18:21:38 +00:00 committed by Gerrit Code Review
commit 814070b9b7
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test-install-glance.yml
View File

@ -19,27 +19,7 @@
become: true
gather_facts: true
any_errors_fatal: true
pre_tasks:
- include: ensure-rabbitmq.yml
vhost_name: "{{ glance_rabbitmq_vhost }}"
user_name: "{{ glance_rabbitmq_userid }}"
user_password: "{{ glance_rabbitmq_password }}"
when:
- "'rabbitmq_all' in groups"
- "groups['rabbitmq_all'] | length > 0"
- "'oslomsg_rpc_all' not in groups"
- include: ensure-oslomsg.yml
rpc_vhost: "{{ glance_oslomsg_rpc_vhost }}"
rpc_user: "{{ glance_oslomsg_rpc_userid }}"
rpc_password: "{{ glance_oslomsg_rpc_password }}"
notify_vhost: "{{ glance_oslomsg_notify_vhost }}"
notify_user: "{{ glance_oslomsg_notify_userid }}"
notify_password: "{{ glance_oslomsg_notify_password }}"
when:
- "'oslomsg_rpc_all' in groups"
- "groups['oslomsg_rpc_all'] | length > 0"
roles:
- role: "{{ glance_rolename | default('os_glance') }}"
- role: "os_glance"
vars_files:
- test-vars.yml

18
test-vars.yml
View File

@ -171,25 +171,7 @@ glance_developer_mode: true
glance_git_install_branch: "{{ test_branch }}"
glance_profiler_hmac_key: "secrete"
glance_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
glance_oslomsg_rpc_userid: glance
glance_oslomsg_rpc_vhost: /glance
glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
glance_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
glance_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
glance_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
glance_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
glance_oslomsg_notify_userid: glance
glance_oslomsg_notify_vhost: /glance
glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
glance_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
glance_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}"
glance_rabbitmq_password: "{{ rabbitmq_password }}"
glance_rabbitmq_port: "{{ rabbitmq_port }}"
glance_rabbitmq_servers: "{{ rabbitmq_servers }}"
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance
glance_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
glance_service_password: "secrete"
glance_venv_tag: "testing"
glance_host: "{{ test_glance_host }}"