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

19 files changed, 0 insertions, 282 deletions

diff --git a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2
deleted file mode 100644
index aa62562ac..000000000
--- a/docker_templates/ceilometer/ceilometer-alarm/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-alarm \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh b/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-alarm/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-alarm/start.sh b/docker_templates/ceilometer/ceilometer-alarm/start.sh
deleted file mode 100755
index ab5501b23..000000000
--- a/docker_templates/ceilometer/ceilometer-alarm/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-alarm"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2
deleted file mode 100644
index 805e5e8eb..000000000
--- a/docker_templates/ceilometer/ceilometer-api/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-api \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-api/config-external.sh b/docker_templates/ceilometer/ceilometer-api/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-api/start.sh b/docker_templates/ceilometer/ceilometer-api/start.sh
deleted file mode 100755
index 0f660e025..000000000
--- a/docker_templates/ceilometer/ceilometer-api/start.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-api"
-ARGS=""
-
-# Loading common functions.
-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 "ceilometer-manage db_sync" ceilometer
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
deleted file mode 100644
index 92a3b70d9..000000000
--- a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
+++ /dev/null
@@ -1,21 +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 ['ubuntu', 'debian'] %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-  && /bin/false
-
-    {% endif %}
-{% elif install_type == 'source' %}
-
-ADD ceilometer.tar /
-RUN ln -s /ceilometer-* ceilometer \
-    && useradd --user-group ceilometer \
-    && pip --no-cache-dir install /ceilometer \
-    && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \
-    && cp -r /ceilometer/etc/* /etc/ceilometer/ \
-    && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer
-
-{% endif %}
diff --git a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2
deleted file mode 100644
index b45c5fac3..000000000
--- a/docker_templates/ceilometer/ceilometer-central/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-central \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-central/config-external.sh b/docker_templates/ceilometer/ceilometer-central/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-central/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-central/start.sh b/docker_templates/ceilometer/ceilometer-central/start.sh
deleted file mode 100755
index f2980a4d5..000000000
--- a/docker_templates/ceilometer/ceilometer-central/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-central"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2
deleted file mode 100644
index 6f425e855..000000000
--- a/docker_templates/ceilometer/ceilometer-collector/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-collector \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-collector/config-external.sh b/docker_templates/ceilometer/ceilometer-collector/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-collector/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-collector/start.sh b/docker_templates/ceilometer/ceilometer-collector/start.sh
deleted file mode 100755
index 3a59c17d1..000000000
--- a/docker_templates/ceilometer/ceilometer-collector/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-collector"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2
deleted file mode 100644
index 0487af710..000000000
--- a/docker_templates/ceilometer/ceilometer-compute/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-compute \
-    python-ceilometerclient \
-    python-pecan \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-compute/config-external.sh b/docker_templates/ceilometer/ceilometer-compute/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-compute/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-compute/start.sh b/docker_templates/ceilometer/ceilometer-compute/start.sh
deleted file mode 100755
index 19d90be2f..000000000
--- a/docker_templates/ceilometer/ceilometer-compute/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-compute"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS
diff --git a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2
deleted file mode 100644
index 67fcfb50e..000000000
--- a/docker_templates/ceilometer/ceilometer-notification/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ceilometer-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum install -y openstack-ceilometer-notification \
-  && yum clean all
-
-    {% endif %}
-{% endif %}
-
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/ceilometer/ceilometer-notification/config-external.sh b/docker_templates/ceilometer/ceilometer-notification/config-external.sh
deleted file mode 100644
index 2835bd5aa..000000000
--- a/docker_templates/ceilometer/ceilometer-notification/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/ceilometer/ceilometer.conf"
-TARGET="/etc/ceilometer/ceilometer.conf"
-OWNER="ceilometer"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/ceilometer/ceilometer-notification/start.sh b/docker_templates/ceilometer/ceilometer-notification/start.sh
deleted file mode 100755
index 8ce4b4488..000000000
--- a/docker_templates/ceilometer/ceilometer-notification/start.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-notification"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS