Merge "Fix RabbitMQ for Ubuntu"

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 }}

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, [

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/*