diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-20 14:37:00 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-20 14:43:32 +0000 |
| commit | fe2e454f267ea023d3e3447d743c340d93e96539 (patch) | |
| tree | 092665acc8be0bad358e4b7b42ef938b9d04a35a | |
| parent | 9cb2b3fc9503e41472679f439056301cd97795d3 (diff) | |
| download | kolla-fe2e454f267ea023d3e3447d743c340d93e96539.tar.gz kolla-fe2e454f267ea023d3e3447d743c340d93e96539.zip | |
Fix RabbitMQ for Ubuntu
In rabbitmq we removed the requirement for hostname since that is
already installed.
Change-Id: Ia2355e332d53763db630d19663c2ddc8bf3aa425
Paritially-Implements: blueprint install-from-ubuntu
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2 | 4 | ||||
| -rw-r--r-- | ansible/roles/rabbitmq/templates/rabbitmq.config.j2 | 4 | ||||
| -rw-r--r-- | docker_templates/rabbitmq/Dockerfile.j2 | 4 |
3 files changed, 7 insertions, 5 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, [ diff --git a/docker_templates/rabbitmq/Dockerfile.j2 b/docker_templates/rabbitmq/Dockerfile.j2 index 119a30317..1c748eee0 100644 --- a/docker_templates/rabbitmq/Dockerfile.j2 +++ b/docker_templates/rabbitmq/Dockerfile.j2 @@ -11,9 +11,7 @@ RUN yum -y install \ {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ - hostname \ - rabbitmq-server \ +RUN apt-get install -y --no-install-recommends rabbitmq-server \ && apt-get clean \ && rm -rf /var/lib/rabbitmq/* |