openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Support service-specific rabbitmq clusters"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 13:16:33 +00:00 committed by Gerrit Code Review
commit 3a07c98a0a
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -69,7 +69,9 @@ glance_enable_v2_registry: True
## RabbitMQ info
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance
glance_rabbitmq_port: 5672
glance_rabbitmq_servers: 127.0.0.1
glance_rabbitmq_use_ssl: False
## DB info
glance_galera_database: glance
glance_galera_user: glance

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

@ -73,12 +73,12 @@ policy_default_rule = {{ glance_policy_default_rule }}
policy_dirs = {{ glance_policy_dirs }}
[oslo_messaging_rabbit]
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_port = {{ rabbitmq_port }}
rabbit_hosts = {{ glance_rabbitmq_servers }}
rabbit_port = {{ glance_rabbitmq_port }}
rabbit_userid = {{ glance_rabbitmq_userid }}
rabbit_password = {{ glance_rabbitmq_password }}
rabbit_virtual_host = {{ glance_rabbitmq_vhost }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }}
rabbit_notification_exchange = glance
rabbit_notification_topic = notifications

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

@ -49,12 +49,12 @@ memcache_secret_key = {{ memcached_encryption_key }}
check_revocations_for_cached = False
[oslo_messaging_rabbit]
rabbit_hosts = {{ rabbitmq_servers }}
rabbit_port = {{ rabbitmq_port }}
rabbit_hosts = {{ glance_rabbitmq_servers }}
rabbit_port = {{ glance_rabbitmq_port }}
rabbit_userid = {{ glance_rabbitmq_userid }}
rabbit_password = {{ glance_rabbitmq_password }}
rabbit_virtual_host = {{ glance_rabbitmq_vhost }}
rabbit_use_ssl = {{ rabbitmq_use_ssl }}
rabbit_use_ssl = {{ glance_rabbitmq_use_ssl }}
rabbit_notification_exchange = glance
rabbit_notification_topic = notifications

8
tests/test-vars.yml
View File

@ -22,6 +22,9 @@ glance_galera_address: 10.100.100.2
glance_galera_database: glance
glance_git_install_branch: master
glance_profiler_hmac_key: "secrete"
glance_rabbitmq_port: 5671
glance_rabbitmq_servers: 10.100.100.2
glance_rabbitmq_use_ssl: true
glance_rabbitmq_password: "secrete"
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance
@ -56,7 +59,4 @@ memcached_encryption_key: "secrete"
memcached_servers: 127.0.0.1
openrc_os_auth_url: "http://127.0.0.1:5000/v3"
openrc_os_domain_name: "Default"
openrc_os_password: "{{ keystone_auth_admin_password }}"
rabbitmq_port: 5671
rabbitmq_servers: 10.100.100.2
rabbitmq_use_ssl: true
openrc_os_password: "{{ keystone_auth_admin_password }}"