diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-23 19:30:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-23 19:30:45 +0000 |
| commit | 9a814e128fe910d57f83506d4e4be2f18156f9a7 (patch) | |
| tree | 4c73f085b01f020cea373d6a8ccb1f72740859a3 /docker | |
| parent | 274d808ff9a82ba19a18b6409f1d8ee57deadc88 (diff) | |
| parent | 3fa0aa2ddc31e3ff41c85c1c35eb276dbd1700e2 (diff) | |
| download | kolla-9a814e128fe910d57f83506d4e4be2f18156f9a7.tar.gz kolla-9a814e128fe910d57f83506d4e4be2f18156f9a7.zip | |
Merge "Replace config-external with a JSON file for Glance"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/glance/glance-api/start.sh | 11 | ||||
| -rwxr-xr-x | docker/glance/glance-registry/start.sh | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/docker/glance/glance-api/start.sh b/docker/glance/glance-api/start.sh index ce3cb6d8b..7ceead556 100755 --- a/docker/glance/glance-api/start.sh +++ b/docker/glance/glance-api/start.sh @@ -1,14 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/glance-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 diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh index 1d8265f80..6191ce851 100755 --- a/docker/glance/glance-registry/start.sh +++ b/docker/glance/glance-registry/start.sh @@ -1,13 +1,12 @@ #!/bin/bash set -o errexit -CMD="/usr/bin/glance-registry" -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) -exec $CMD $ARGS +echo "Running command: ${CMD}" +exec $CMD |