From aebb16fff9f33727aa9ce49120a1c6384544bfdc Mon Sep 17 00:00:00 2001 From: rthallisey Date: Fri, 28 Aug 2015 18:42:18 -0400 Subject: Replace config-external with a JSON file for Nova Change-Id: I38c545484a7b1f3906d844eb3a7486e11c4b276a Partially-Implements: blueprint replace-config-external --- docker/nova/nova-api/start.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docker/nova/nova-api') diff --git a/docker/nova/nova-api/start.sh b/docker/nova/nova-api/start.sh index ad25ba65c..c61c37feb 100755 --- a/docker/nova/nova-api/start.sh +++ b/docker/nova/nova-api/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/nova-api" -ARGS="" - # Loading common functions. source /opt/kolla/kolla-common.sh -# Execute config strategy -set_configs +# Generate run command +python /opt/kolla/set_configs.py +CMD=$(cat /run_command) # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -17,4 +15,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -exec $CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD -- cgit v1.2.3