diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-25 10:47:36 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-25 11:06:42 +0000 |
| commit | 0cc328c625498192d5eeaeaac04d5a397737b271 (patch) | |
| tree | b62f69b924ee83642f5aa3ae786e6fa78c54108b /docker/murano | |
| parent | 9b18d2d28bb58ba7a957b788c905f3f077cabede (diff) | |
| download | kolla-0cc328c625498192d5eeaeaac04d5a397737b271.tar.gz kolla-0cc328c625498192d5eeaeaac04d5a397737b271.zip | |
Replace config-external - murano
Change-Id: I8c5fdb2f2d3284960318a8189c4cc5bd6a8e59e9
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/murano')
| -rwxr-xr-x | docker/murano/murano-api/start.sh | 10 | ||||
| -rwxr-xr-x | docker/murano/murano-engine/start.sh | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/docker/murano/murano-api/start.sh b/docker/murano/murano-api/start.sh index 7d712177d..59599398e 100755 --- a/docker/murano/murano-api/start.sh +++ b/docker/murano/murano-api/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/murano-api" -ARGS="--config-file /etc/murano/murano.conf" - # 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,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -exec $CMD $ARGS +exec $CMD diff --git a/docker/murano/murano-engine/start.sh b/docker/murano/murano-engine/start.sh index 22834fc4c..d43e03581 100755 --- a/docker/murano/murano-engine/start.sh +++ b/docker/murano/murano-engine/start.sh @@ -1,13 +1,11 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/murano-engine" -ARGS="--config-file /etc/murano/murano.conf" - # 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) -exec $CMD $ARGS +exec $CMD |