From c97ccd6a5f7330d88dfba94a8226948fb320cba6 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Wed, 1 Jul 2015 17:23:13 +0000
Subject: Ansible Rabbitmq support

Adds initial support for Rabbitmq in Ansible using the CONFIG_EXTERNAL methods.

Additionally, this refactors some of the Rabbitmq config script to allow for
reuse by CONFIG_EXTERNAL.

Partially Implements: blueprint ansible-service

Change-Id: I1765548f7e4f1258eb8a49e2a23242955f52655d
---
 docker/common/rabbitmq/start.sh | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'docker/common/rabbitmq/start.sh')

diff --git a/docker/common/rabbitmq/start.sh b/docker/common/rabbitmq/start.sh
index 4e76e382f..8f7fef330 100755
--- a/docker/common/rabbitmq/start.sh
+++ b/docker/common/rabbitmq/start.sh
@@ -1,7 +1,23 @@
 #!/bin/bash
 
-. /opt/kolla/config-rabbit.sh
+set -o errexit
 
-configure_rabbit
+CMD="/usr/sbin/rabbitmq-server"
+ARGS=""
 
-exec /usr/sbin/rabbitmq-server
+# loading common functions
+source /opt/kolla/kolla-common.sh
+
+# config-internal script exec out of this function, it does not return here
+set_configs
+
+# loading functions
+source /opt/kolla/config-rabbit.sh
+
+# This catches all cases of the BOOTSTRAP variable being set, including empty
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    set_rabbitmq_cookie
+    exit 0
+fi
+
+$CMD $ARGS
-- 
cgit v1.2.3