4 files changed, 12 insertions, 25 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 1d6db3e13..764dd7c92 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -19,9 +19,7 @@ RUN apt-get install -y --no-install-recommends rabbitmq-server \
 
 RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
 
-COPY start.sh /
-COPY config-rabbit.sh /opt/kolla/
-
-CMD ["/start.sh"]
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+RUN chmod 755 /usr/local/bin/kolla_extend_start
 
 {{ include_footer }}
diff --git a/docker/rabbitmq/config-rabbit.sh b/docker/rabbitmq/config-rabbit.sh
deleted file mode 100644
index c87a2ab48..000000000
--- a/docker/rabbitmq/config-rabbit.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-function set_rabbitmq_cookie {
-    echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
-    chown -R rabbitmq: /var/lib/rabbitmq
-    chmod 400 /var/lib/rabbitmq/.erlang.cookie
-}
diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh
new file mode 100644
index 000000000..e1c1007e3
--- /dev/null
+++ b/docker/rabbitmq/extend_start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
+# of the KOLLA_BOOTSTRAP variable being set, including empty.
+if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
+    echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
+    chown -R rabbitmq: /var/lib/rabbitmq
+    chmod 400 /var/lib/rabbitmq/.erlang.cookie
+    exit 0
+fi
diff --git a/docker/rabbitmq/start.sh b/docker/rabbitmq/start.sh
deleted file mode 100755
index 1a018bc89..000000000
--- a/docker/rabbitmq/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-# loading common functions
-source /opt/kolla/kolla-common.sh
-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
-
-exec $CMD