diff options
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/cinder/cinder-api/extend_start.sh (renamed from docker/cinder/cinder-api/start.sh) | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 index 4c481a45f..59d20cd80 100644 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ b/docker/cinder/cinder-api/Dockerfile.j2 @@ -10,8 +10,7 @@ RUN yum install -y python-keystone \ {% endif %} {% endif %} -COPY ./start.sh / - -CMD ["/start.sh"] +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} diff --git a/docker/cinder/cinder-api/start.sh b/docker/cinder/cinder-api/extend_start.sh index 553158a82..9cf68ae86 100755..100644 --- a/docker/cinder/cinder-api/start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -1,14 +1,9 @@ #!/bin/bash set -o errexit -# Loading common functions. -source /opt/kolla/kolla-common.sh - # 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 "cinder-manage db sync" cinder exit 0 fi - -exec $CMD |