diff options
| author | rthallisey <rhallise@redhat.com> | 2015-08-28 18:29:43 -0400 |
|---|---|---|
| committer | Ryan Hallisey <rhallise@redhat.com> | 2015-09-18 15:19:06 -0400 |
| commit | 3fa0aa2ddc31e3ff41c85c1c35eb276dbd1700e2 (patch) | |
| tree | b863fe2ea0a85e0ced5ff305c26e97bece959ebd /docker/glance | |
| parent | 180e8c3331fc9e839739512a92bdc57b6244bd8e (diff) | |
| download | kolla-3fa0aa2ddc31e3ff41c85c1c35eb276dbd1700e2.tar.gz kolla-3fa0aa2ddc31e3ff41c85c1c35eb276dbd1700e2.zip | |
Replace config-external with a JSON file for Glance
Change-Id: I14187db31a009c150424ea28b854a78c9ae3941d
Partially-Implements: blueprint replace-config-external
Diffstat (limited to 'docker/glance')
| -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 |