diff options
| author | Angus Salkeld <asalkeld@mirantis.com> | 2016-02-23 11:09:08 +1000 |
|---|---|---|
| committer | Angus Salkeld <asalkeld@mirantis.com> | 2016-02-23 11:09:08 +1000 |
| commit | 2597bf8cfd27dc82133cc4bf978c8268f00953b6 (patch) | |
| tree | ab03c3a7e2c0bc9d90f5495d930ce62301f29522 /docker | |
| parent | 35660e0e100b0f4f871d74a3e5b05afe6da104ab (diff) | |
| download | kolla-2597bf8cfd27dc82133cc4bf978c8268f00953b6.tar.gz kolla-2597bf8cfd27dc82133cc4bf978c8268f00953b6.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/start.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index a42c01391..78923c75a 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} |