From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001 From: Sam Yaple Date: Fri, 28 Aug 2015 12:16:53 +0000 Subject: Move docker_templates to docker dir Updated build.py to reflect this change. Deprecate --template option and make it a noop. Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2 Partially-Implements: blueprint remove-docker-dir --- docker_templates/cinder/cinder-api/Dockerfile.j2 | 18 ------------------ .../cinder/cinder-api/config-external.sh | 10 ---------- docker_templates/cinder/cinder-api/start.sh | 21 --------------------- 3 files changed, 49 deletions(-) delete mode 100644 docker_templates/cinder/cinder-api/Dockerfile.j2 delete mode 100644 docker_templates/cinder/cinder-api/config-external.sh delete mode 100755 docker_templates/cinder/cinder-api/start.sh (limited to 'docker_templates/cinder/cinder-api') diff --git a/docker_templates/cinder/cinder-api/Dockerfile.j2 b/docker_templates/cinder/cinder-api/Dockerfile.j2 deleted file mode 100644 index 196f93baf..000000000 --- a/docker_templates/cinder/cinder-api/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-cinder-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) - -{% if install_type == 'binary' %} - {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} - -RUN yum install -y python-keystone \ - && yum clean all - - {% endif %} -{% endif %} - -COPY ./start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] - -{{ include_footer }} diff --git a/docker_templates/cinder/cinder-api/config-external.sh b/docker_templates/cinder/cinder-api/config-external.sh deleted file mode 100644 index 08d8cde0a..000000000 --- a/docker_templates/cinder/cinder-api/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/opt/kolla/cinder-api/cinder.conf" -TARGET="/etc/cinder/cinder.conf" -OWNER="cinder" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi diff --git a/docker_templates/cinder/cinder-api/start.sh b/docker_templates/cinder/cinder-api/start.sh deleted file mode 100755 index 6c61b3a4e..000000000 --- a/docker_templates/cinder/cinder-api/start.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/cinder-api" -ARGS="--config-file /etc/cinder/cinder.conf" - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -# Execute config strategy -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 "cinder-manage db sync" cinder - exit 0 -fi - -exec $CMD $ARGS -- cgit v1.2.3