diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-04 12:47:45 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-09 15:29:55 +0000 |
| commit | e7a7cc90178dcc3249e2d444e56c0415fc6ff5c1 (patch) | |
| tree | 89f7d359d6c461512ef6f80756b635cfb26f365e /docker/common | |
| parent | fcda6a06d8eee9d3f3199962b36a04a8c702072c (diff) | |
| download | kolla-e7a7cc90178dcc3249e2d444e56c0415fc6ff5c1.tar.gz kolla-e7a7cc90178dcc3249e2d444e56c0415fc6ff5c1.zip | |
Ansible Glance support
Adds support for glance in ansible
Partially-Implements: blueprint ansible-service
Change-Id: I2d162e79f85877116b0e33b1843de6ccb62a445a
Diffstat (limited to 'docker/common')
| -rwxr-xr-x | docker/common/glance/glance-api/start.sh | 7 | ||||
| -rwxr-xr-x | docker/common/glance/glance-registry/start.sh | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/docker/common/glance/glance-api/start.sh b/docker/common/glance/glance-api/start.sh index 152fb019f..26db7fc1c 100755 --- a/docker/common/glance/glance-api/start.sh +++ b/docker/common/glance/glance-api/start.sh @@ -10,4 +10,11 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + su -s /bin/sh -c "glance-manage db_sync" glance + exit 0 +fi + exec $CMD $ARGS diff --git a/docker/common/glance/glance-registry/start.sh b/docker/common/glance/glance-registry/start.sh index e77232cf7..70899985e 100755 --- a/docker/common/glance/glance-registry/start.sh +++ b/docker/common/glance/glance-registry/start.sh @@ -10,11 +10,4 @@ source /opt/kolla/kolla-common.sh # Config-internal script exec out of this function, it does not return here. set_configs -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - su -s /bin/sh -c "glance-manage db_sync" glance - exit 0 -fi - exec $CMD $ARGS |