openstack
/
openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Default MQ RPC/Notify credentials/vhosts to match"

This commit is contained in:
Zuul 2018-07-31 14:48:33 +00:00 committed by Gerrit Code Review
parent 1b4d4212c8 1bff76c624
commit ae48cd3f18
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -112,8 +112,9 @@ glance_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit'
glance_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
glance_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
glance_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
glance_oslomsg_notify_userid: glance
glance_oslomsg_notify_vhost: /glance
glance_oslomsg_notify_userid: "{{ glance_oslomsg_rpc_userid }}"
glance_oslomsg_notify_password: "{{ glance_oslomsg_rpc_password }}"
glance_oslomsg_notify_vhost: "{{ glance_oslomsg_rpc_vhost }}"
## Database info
glance_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"

2
templates/glance-api.conf.j2
View File

@ -66,7 +66,7 @@ policy_default_rule = {{ glance_policy_default_rule }}
policy_dirs = {{ glance_policy_dirs }}
[oslo_messaging_rabbit]
ssl = {{ glance_oslomsg_rpc_use_ssl }}
ssl = {{ glance_oslomsg_notify_use_ssl | bool }}
rabbit_notification_exchange = glance
rabbit_notification_topic = notifications

2
templates/glance-registry.conf.j2
View File

@ -43,7 +43,7 @@ memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcached_encryption_key }}
[oslo_messaging_rabbit]
ssl = {{ glance_oslomsg_rpc_use_ssl }}
ssl = {{ glance_oslomsg_notify_use_ssl | bool }}
rabbit_notification_exchange = glance
rabbit_notification_topic = notifications