diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-21 13:08:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-21 13:08:48 +0000 |
| commit | 91088e595ff2406231eae707d9ca71a2ad36199c (patch) | |
| tree | e6819e098a469acd87750cef573ab1905bf8dc44 /ansible | |
| parent | 6dd30b2a72b6e760ecd2426110dcf965f4793b57 (diff) | |
| parent | fe2e454f267ea023d3e3447d743c340d93e96539 (diff) | |
| download | kolla-91088e595ff2406231eae707d9ca71a2ad36199c.tar.gz kolla-91088e595ff2406231eae707d9ca71a2ad36199c.zip | |
Merge "Fix RabbitMQ for Ubuntu"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.config.j2 | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 index a62cac893..732a286a0 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 @@ -1,3 +1,7 @@ RABBITMQ_NODENAME=rabbit + +# See bug https://bugs.launchpad.net/ubuntu/+source/erlang/+bug/1374109 +{% if not kolla_base_distro in ['ubuntu', 'debian'] %} export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} +{% endif %} export ERL_EPMD_PORT={{ rabbitmq_epmd_port }} diff --git a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 index d12b7f271..6aa3a5fb1 100644 --- a/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 +++ b/ansible/roles/rabbitmq/templates/rabbitmq.config.j2 @@ -11,10 +11,10 @@ {default_user, <<"{{ rabbitmq_user }}">>}, {default_pass, <<"{{ rabbitmq_password }}">>}, {cluster_partition_handling, autoheal}, - {cluster_nodes, [ + {cluster_nodes, {[ {% for host in groups['rabbitmq'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %} - ]} + ], disc}} ]}, {rabbitmq_management, [ {listener, [ |