diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-28 15:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-28 15:16:04 +0000 |
| commit | 4d6eaa25fc881dec699e5b0a4a4f196881338b2c (patch) | |
| tree | 6a9e5cc784a8d701844a2703214864d64b526e58 | |
| parent | b3a127dbad0e53b52f50f287cc673946112c73ee (diff) | |
| parent | 0c6594c25864d0c90cd0009726cee84967fe65dc (diff) | |
| download | kolla-4d6eaa25fc881dec699e5b0a4a4f196881338b2c.tar.gz kolla-4d6eaa25fc881dec699e5b0a4a4f196881338b2c.zip | |
Merge "Tells rabbitmq to listen on single ip"
| -rw-r--r-- | ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 | 1 | ||||
| -rw-r--r-- | ansible/roles/message-broker/templates/rabbitmq.config.j2 | 21 |
2 files changed, 19 insertions, 3 deletions
diff --git a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 b/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 index 8921f227e..555f94dc1 100644 --- a/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 +++ b/ansible/roles/message-broker/templates/rabbitmq-env.conf.j2 @@ -1 +1,2 @@ RABBITMQ_NODENAME=rabbit +export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} diff --git a/ansible/roles/message-broker/templates/rabbitmq.config.j2 b/ansible/roles/message-broker/templates/rabbitmq.config.j2 index e51d0c56d..47ba09e85 100644 --- a/ansible/roles/message-broker/templates/rabbitmq.config.j2 +++ b/ansible/roles/message-broker/templates/rabbitmq.config.j2 @@ -1,9 +1,24 @@ [ + {kernel, [ + {inet_dist_use_interface, {% raw %}{{% endraw %}{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] | regex_replace('\.', ',') }}}} + ]}, {rabbit, [ - {cluster_nodes, [{% for host in groups['database'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}]}, + {tcp_listeners, [ + {"{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}", 5672} + ]}, {default_user, <<"{{ rabbitmq_user }}">>}, - {default_pass, <<"{{ rabbitmq_password }}">>} + {default_pass, <<"{{ rabbitmq_password }}">>}, + {cluster_partition_handling, autoheal}, + {cluster_nodes, [ + {% for host in groups['database'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %} + + ]} + ]}, + {rabbitmq_management, [ + {listener, [ + {ip, "{{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}"}, + {port, 15672} + ]} ]} ]. % EOF - |