Merge "Skip extend_start.sh if KOLLA_SKIP_EXTEND_START is defined"

This commit is contained in:
Jenkins 2016-02-23 15:38:06 +00:00 committed by Gerrit Code Review
commit 314b5026d9

View File

@ -25,8 +25,10 @@ sudo -E kolla_set_configs
CMD=$(cat /run_command) CMD=$(cat /run_command)
ARGS="" ARGS=""
# Run additional commands if present if [[ ! "${!KOLLA_SKIP_EXTEND_START[@]}" ]]; then
source kolla_extend_start # Run additional commands if present
source kolla_extend_start
fi
echo "Running command: '${CMD}${ARGS:+ $ARGS}'" echo "Running command: '${CMD}${ARGS:+ $ARGS}'"
exec ${CMD} ${ARGS} exec ${CMD} ${ARGS}