From 214ac7e6084583f703041fdfd19d67dda9417274 Mon Sep 17 00:00:00 2001
From: Michal Stachowski <michal.stachowski@intel.com>
Date: Wed, 24 Jun 2015 14:10:10 +0200
Subject: RabbitMQ container with HA support

This is new RabbitMQ container with support for HA. It's next step for
provide HA support in Kolla project. RabbitMQ is supporting now
active/active model and It's ready for active/passive model.

Change-Id: I2eb6c65f6268ee96d377e72cf880a01c8042559e
Implements: blueprint rabbitmq-ha
---
 docker/common/rabbitmq/rabbitmq-env.conf |  2 +-
 docker/common/rabbitmq/rabbitmq.config   |  1 +
 docker/common/rabbitmq/start.sh          | 21 ++-------------------
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'docker/common')

diff --git a/docker/common/rabbitmq/rabbitmq-env.conf b/docker/common/rabbitmq/rabbitmq-env.conf
index e76f18f0b..a8926619c 100644
--- a/docker/common/rabbitmq/rabbitmq-env.conf
+++ b/docker/common/rabbitmq/rabbitmq-env.conf
@@ -1,2 +1,2 @@
-RABBITMQ_NODENAME=@RABBITMQ_NODENAME@
+RABBITMQ_NODENAME=rabbit
 RABBITMQ_LOG_BASE=@RABBITMQ_LOG_BASE@
diff --git a/docker/common/rabbitmq/rabbitmq.config b/docker/common/rabbitmq/rabbitmq.config
index 15a47eba1..7cd0f6829 100644
--- a/docker/common/rabbitmq/rabbitmq.config
+++ b/docker/common/rabbitmq/rabbitmq.config
@@ -1,5 +1,6 @@
 [
   {rabbit, [
+    @RABBITMQ_CLUSTER_CONFIGURATION@
     {default_user, <<"@RABBITMQ_USER@">>},
     {default_pass, <<"@RABBITMQ_PASS@">>}
   ]},
diff --git a/docker/common/rabbitmq/start.sh b/docker/common/rabbitmq/start.sh
index f70c34866..4e76e382f 100755
--- a/docker/common/rabbitmq/start.sh
+++ b/docker/common/rabbitmq/start.sh
@@ -1,24 +1,7 @@
 #!/bin/bash
 
-set -e
+. /opt/kolla/config-rabbit.sh
 
-: ${RABBITMQ_USER:=guest}
-: ${RABBITMQ_PASS:=guest}
-: ${RABBITMQ_NODENAME:=rabbit}
-: ${RABBITMQ_LOG_BASE:=/var/log/rabbitmq}
-
-sed -i '
-    s|@RABBITMQ_USER@|'"$RABBITMQ_USER"'|g
-    s|@RABBITMQ_PASS@|'"$RABBITMQ_PASS"'|g
-' /etc/rabbitmq/rabbitmq.config
-
-sed -i '
-    s|@RABBITMQ_NODENAME@|'"$RABBITMQ_NODENAME"'|g
-    s|@RABBITMQ_LOG_BASE@|'"$RABBITMQ_LOG_BASE"'|g
-' /etc/rabbitmq/rabbitmq-env.conf
-
-# work around:
-#   https://bugs.launchpad.net/ubuntu/+source/rabbitmq-server/+bug/653405
-echo "${RABBITMQ_SERVICE_HOST} `/usr/bin/hostname -s`" > /etc/hosts
+configure_rabbit
 
 exec /usr/sbin/rabbitmq-server
-- 
cgit v1.2.3