diff options
Diffstat (limited to 'docker/cinder/cinder-api')
| -rw-r--r-- | docker/cinder/cinder-api/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 14 |
2 files changed, 0 insertions, 36 deletions
diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2 deleted file mode 100644 index b82fba6d3..000000000 --- a/docker/cinder/cinder-api/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block cinder_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set cinder_api_packages = [ -] %} - -{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start - -RUN chmod 644 /usr/local/bin/kolla_cinder_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block cinder_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh deleted file mode 100644 index 94b0fe875..000000000 --- a/docker/cinder/cinder-api/extend_start.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -o errexit - -# 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 - cinder-manage db sync - exit 0 -fi - -if [[ "${!KOLLA_OSM[@]}" ]]; then - cinder-manage db online_data_migrations - exit 0 -fi |
