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

13 files changed, 0 insertions, 207 deletions

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
diff --git a/docker_templates/cinder/cinder-backup/Dockerfile.j2 b/docker_templates/cinder/cinder-backup/Dockerfile.j2
deleted file mode 100644
index fa331b195..000000000
--- a/docker_templates/cinder/cinder-backup/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type  }}-cinder-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/cinder/cinder-backup/config-external.sh b/docker_templates/cinder/cinder-backup/config-external.sh
deleted file mode 100644
index ff4752492..000000000
--- a/docker_templates/cinder/cinder-backup/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-backup/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-backup/start.sh b/docker_templates/cinder/cinder-backup/start.sh
deleted file mode 100755
index 7d9403f07..000000000
--- a/docker_templates/cinder/cinder-backup/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/cinder-backup"
-ARGS="--config-file /etc/cinder/cinder.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/cinder/cinder-base/Dockerfile.j2 b/docker_templates/cinder/cinder-base/Dockerfile.j2
deleted file mode 100644
index 1cce34a9e..000000000
--- a/docker_templates/cinder/cinder-base/Dockerfile.j2
+++ /dev/null
@@ -1,49 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type  }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install openstack-cinder \
-    python-automaton \
-    lvm2 \
-  && yum clean all \
-  && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-  && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
-
-     {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-  && /bin/false
-
-    {% endif %}
-{% elif install_type == 'source' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install lvm2 \
-   && yum clean all
-
-     {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends lvm2 \
-   && apt-get clean
-
-    {% endif %}
-
-ADD cinder.tar /
-RUN ln -s /cinder-* cinder \
-    && useradd --user-group cinder \
-    && pip --no-cache-dir install /cinder \
-    && mkdir -p /etc/cinder /var/log/cinder /home/cinder \
-    && cp -r /cinder/etc/cinder/* /etc/cinder/ \
-    && chown -R cinder: /etc/cinder /var/log/cinder /home/cinder \
-    && sed -i "s|udev_rules = 1|udev_rules = 0|g" /etc/lvm/lvm.conf \
-    && sed -i "s|udev_sync = 1|udev_sync = 0|g" /etc/lvm/lvm.conf
-
-# NOTE(sdake): The sed operations make LVM tools work inside a container - see
-# https://groups.google.com/forum/#!topic/docker-user/n4Xtvsb4RAw
-
-{% endif %}
diff --git a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2 b/docker_templates/cinder/cinder-scheduler/Dockerfile.j2
deleted file mode 100644
index fa331b195..000000000
--- a/docker_templates/cinder/cinder-scheduler/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type  }}-cinder-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/cinder/cinder-scheduler/config-external.sh b/docker_templates/cinder/cinder-scheduler/config-external.sh
deleted file mode 100644
index 3c8ca26be..000000000
--- a/docker_templates/cinder/cinder-scheduler/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-scheduler/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-scheduler/start.sh b/docker_templates/cinder/cinder-scheduler/start.sh
deleted file mode 100755
index 759175e3f..000000000
--- a/docker_templates/cinder/cinder-scheduler/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/cinder-scheduler"
-ARGS="--config-file /etc/cinder/cinder.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/cinder/cinder-volume/Dockerfile.j2 b/docker_templates/cinder/cinder-volume/Dockerfile.j2
deleted file mode 100644
index 6393798bd..000000000
--- a/docker_templates/cinder/cinder-volume/Dockerfile.j2
+++ /dev/null
@@ -1,19 +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 lvm2 \
-    scsi-target-utils \
-  && 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-volume/config-external.sh b/docker_templates/cinder/cinder-volume/config-external.sh
deleted file mode 100755
index 2f6b99fc9..000000000
--- a/docker_templates/cinder/cinder-volume/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/cinder-volume/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-volume/start.sh b/docker_templates/cinder/cinder-volume/start.sh
deleted file mode 100755
index a6874ce47..000000000
--- a/docker_templates/cinder/cinder-volume/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/cinder-volume"
-ARGS="--config-file /etc/cinder/cinder.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS