openstack/kolla-ansible
Code Issues Proposed changes

Merge "glance-*, fix rabbit config with ceilometer"

Browse Source
This commit is contained in:
Jenkins 2016-06-27 03:13:29 +00:00 committed by Gerrit Code Review
commit d0caee3d66
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -55,9 +55,10 @@ filesystem_store_datadir = /var/lib/glance/images/
driver = messagingv2 driver = messagingv2
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_host = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true
rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

3
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -34,9 +34,10 @@ flavor = keystone
driver = messagingv2 driver = messagingv2
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_host = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }} rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true
rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}