openstack/kolla-ansible
Code Issues Proposed changes

Fix RabbitMQ for Ubuntu

Browse Source 
In rabbitmq we removed the requirement for hostname since that is
already installed.

Change-Id: Ia2355e332d53763db630d19663c2ddc8bf3aa425
Paritially-Implements: blueprint install-from-ubuntu
This commit is contained in:
Sam Yaple 2015-08-20 14:37:00 +00:00
parent 9cb2b3fc95
commit fe2e454f26
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/rabbitmq/templates/rabbitmq-env.conf.j2
View File

@ -1,3 +1,7 @@
RABBITMQ_NODENAME=rabbit 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'] }} export ERL_EPMD_ADDRESS={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
{% endif %}
export ERL_EPMD_PORT={{ rabbitmq_epmd_port }} export ERL_EPMD_PORT={{ rabbitmq_epmd_port }}

4
ansible/roles/rabbitmq/templates/rabbitmq.config.j2
View File

@ -11,10 +11,10 @@
{default_user, <<"{{ rabbitmq_user }}">>}, {default_user, <<"{{ rabbitmq_user }}">>},
{default_pass, <<"{{ rabbitmq_password }}">>}, {default_pass, <<"{{ rabbitmq_password }}">>},
{cluster_partition_handling, autoheal}, {cluster_partition_handling, autoheal},
{cluster_nodes, [ {cluster_nodes, {[
{% for host in groups['rabbitmq'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %} {% for host in groups['rabbitmq'] %}'rabbit@{{ hostvars[host]['ansible_hostname'] }}'{% if not loop.last %},{% endif %}{% endfor %}
]} ], disc}}
]}, ]},
{rabbitmq_management, [ {rabbitmq_management, [
{listener, [ {listener, [

4
docker_templates/rabbitmq/Dockerfile.j2
View File

@ -11,9 +11,7 @@ RUN yum -y install \
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
RUN apt-get install -y --no-install-recommends \ RUN apt-get install -y --no-install-recommends rabbitmq-server \
hostname \
rabbitmq-server \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/rabbitmq/* && rm -rf /var/lib/rabbitmq/*