diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-25 13:51:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-25 13:51:06 +0000 |
| commit | 07506e4d78c5e047fee34a771191cd541b0a7cfa (patch) | |
| tree | 6c4e695698761962e3752a28ecbc353ef6d91ac8 /docker | |
| parent | b27564bca2d90af97e7337826473ac504da1d430 (diff) | |
| parent | 0cc328c625498192d5eeaeaac04d5a397737b271 (diff) | |
| download | kolla-07506e4d78c5e047fee34a771191cd541b0a7cfa.tar.gz kolla-07506e4d78c5e047fee34a771191cd541b0a7cfa.zip | |
Merge "Replace config-external - murano"
Diffstat (limited to 'docker')
| -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 |