diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-27 03:13:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-27 03:13:29 +0000 |
| commit | d0caee3d663f9c701d4781f84dd10f38b4f9d843 (patch) | |
| tree | 3fdd2f5e60fcd913838b68f25f9b1ced60b1c3d5 | |
| parent | bed6d14534aab5c75f62e9207acc8020bfb7bf22 (diff) | |
| parent | 2a2a86ac43f86ee698ce080486612984f67d9ea0 (diff) | |
| download | kolla-d0caee3d663f9c701d4781f84dd10f38b4f9d843.tar.gz kolla-d0caee3d663f9c701d4781f84dd10f38b4f9d843.zip | |
Merge "glance-*, fix rabbit config with ceilometer"
| -rw-r--r-- | ansible/roles/glance/templates/glance-api.conf.j2 | 3 | ||||
| -rw-r--r-- | ansible/roles/glance/templates/glance-registry.conf.j2 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ansible/roles/glance/templates/glance-api.conf.j2 b/ansible/roles/glance/templates/glance-api.conf.j2 index 8ece2f91a..f81a7296b 100644 --- a/ansible/roles/glance/templates/glance-api.conf.j2 +++ b/ansible/roles/glance/templates/glance-api.conf.j2 @@ -55,9 +55,10 @@ filesystem_store_datadir = /var/lib/glance/images/ driver = messagingv2 [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_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 %} driver = noop {% endif %} diff --git a/ansible/roles/glance/templates/glance-registry.conf.j2 b/ansible/roles/glance/templates/glance-registry.conf.j2 index 49d35ee02..55146ac87 100644 --- a/ansible/roles/glance/templates/glance-registry.conf.j2 +++ b/ansible/roles/glance/templates/glance-registry.conf.j2 @@ -34,9 +34,10 @@ flavor = keystone driver = messagingv2 [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_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 %} driver = noop {% endif %} |