From 2597bf8cfd27dc82133cc4bf978c8268f00953b6 Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@mirantis.com>
Date: Tue, 23 Feb 2016 11:09:08 +1000
Subject: [PATCH] Skip extend_start.sh if KOLLA_SKIP_EXTEND_START is defined
This is all kolla-mesos needs, so that we can run the extend_start
within the context of our start script. We need to do this to track
dependencies of the commands (one of which is the extend_start).
implements blueprint custom-extend-start
Change-Id: Ib844adc9c42dd8862281eb3f903d6c2b4695a34d
---
docker/base/start.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/docker/base/start.sh b/docker/base/start.sh
index a42c01391d..78923c75a7 100644
--- a/docker/base/start.sh
+++ b/docker/base/start.sh
@@ -25,8 +25,10 @@ sudo -E kolla_set_configs
CMD=$(cat /run_command)
ARGS=""
-# Run additional commands if present
-source kolla_extend_start
+if [[ ! "${!KOLLA_SKIP_EXTEND_START[@]}" ]]; then
+ # Run additional commands if present
+ source kolla_extend_start
+fi
echo "Running command: '${CMD}${ARGS:+ $ARGS}'"
exec ${CMD} ${ARGS}
--
GitLab