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

4 files changed, 0 insertions, 76 deletions

diff --git a/docker_templates/rabbitmq/Dockerfile.j2 b/docker_templates/rabbitmq/Dockerfile.j2
deleted file mode 100644
index 1baf2ce80..000000000
--- a/docker_templates/rabbitmq/Dockerfile.j2
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
-
-RUN yum -y install \
-        hostname \
-        rabbitmq-server \
-    && yum clean all \
-    && rm -rf /var/lib/rabbitmq/*
-
-{% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get install -y --no-install-recommends rabbitmq-server \
-    && apt-get clean \
-    && rm -rf /var/lib/rabbitmq/*
-
-{% endif %}
-
-RUN /usr/lib/rabbitmq/bin/rabbitmq-plugins enable rabbitmq_management
-
-COPY start.sh /
-COPY config-rabbit.sh config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/rabbitmq/config-external.sh b/docker_templates/rabbitmq/config-external.sh
deleted file mode 100644
index 33810d621..000000000
--- a/docker_templates/rabbitmq/config-external.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-SOURCE_CONFIG="/opt/kolla/rabbitmq/rabbitmq.config"
-TARGET_CONFIG="/etc/rabbitmq/rabbitmq.config"
-SOURCE_ENV="/opt/kolla/rabbitmq/rabbitmq-env.conf"
-TARGET_ENV="/etc/rabbitmq/rabbitmq-env.conf"
-OWNER="rabbitmq"
-
-# Cluster configuration
-if [[ -f "$SOURCE_CONFIG" ]]; then
-    cp -af $SOURCE_CONFIG $TARGET_CONFIG
-    chown ${OWNER}: $TARGET_CONFIG
-    chmod 0600 $TARGET_CONFIG
-fi
-
-if [[ -f "$SOURCE_ENV" ]]; then
-    cp -af $SOURCE_ENV $TARGET_ENV
-    chown ${OWNER}: $TARGET_ENV
-    chmod 0600 $TARGET_ENV
-fi
diff --git a/docker_templates/rabbitmq/config-rabbit.sh b/docker_templates/rabbitmq/config-rabbit.sh
deleted file mode 100644
index c87a2ab48..000000000
--- a/docker_templates/rabbitmq/config-rabbit.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-function set_rabbitmq_cookie {
-    echo "${RABBITMQ_CLUSTER_COOKIE}" > /var/lib/rabbitmq/.erlang.cookie
-    chown -R rabbitmq: /var/lib/rabbitmq
-    chmod 400 /var/lib/rabbitmq/.erlang.cookie
-}
diff --git a/docker_templates/rabbitmq/start.sh b/docker_templates/rabbitmq/start.sh
deleted file mode 100755
index 749bee963..000000000
--- a/docker_templates/rabbitmq/start.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/sbin/rabbitmq-server"
-ARGS=""
-
-# loading common functions
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-# loading functions
-source /opt/kolla/config-rabbit.sh
-
-# This catches all cases of the BOOTSTRAP variable being set, including empty
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    set_rabbitmq_cookie
-    exit 0
-fi
-
-$CMD $ARGS