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

7 files changed, 0 insertions, 90 deletions

diff --git a/docker_templates/murano/murano-api/Dockerfile.j2 b/docker_templates/murano/murano-api/Dockerfile.j2
deleted file mode 100644
index f1d7e1f42..000000000
--- a/docker_templates/murano/murano-api/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/murano/murano-api/config-external.sh b/docker_templates/murano/murano-api/config-external.sh
deleted file mode 100644
index 5d9a2da49..000000000
--- a/docker_templates/murano/murano-api/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/murano/murano-api/start.sh b/docker_templates/murano/murano-api/start.sh
deleted file mode 100755
index 7d712177d..000000000
--- a/docker_templates/murano/murano-api/start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/murano-api"
-ARGS="--config-file /etc/murano/murano.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 "murano-db-manage --config-file /etc/murano/murano.conf upgrade" murano
-    exit 0
-fi
-
-exec $CMD $ARGS
diff --git a/docker_templates/murano/murano-base/Dockerfile.j2 b/docker_templates/murano/murano-base/Dockerfile.j2
deleted file mode 100644
index cb700e5e0..000000000
--- a/docker_templates/murano/murano-base/Dockerfile.j2
+++ /dev/null
@@ -1,19 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-{% if install_type == 'binary' %}
-
-RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
-    && /bin/false
-
-{% elif install_type == 'source' %}
-
-ADD murano.tar /
-RUN ln -s /murano-* murano \
-    && useradd --user-group murano \
-    && pip --no-cache-dir install /murano \
-    && mkdir -p /etc/murano /var/log/murano /home/murano \
-    && cp -r /murano/etc/murano/* /etc/murano/ \
-    && chown -R murano: /etc/murano /var/log/murano /home/murano
-
-{% endif %}
diff --git a/docker_templates/murano/murano-engine/Dockerfile.j2 b/docker_templates/murano/murano-engine/Dockerfile.j2
deleted file mode 100644
index f1d7e1f42..000000000
--- a/docker_templates/murano/murano-engine/Dockerfile.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-murano-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net/kolla)
-
-COPY config-external.sh /opt/kolla/
-COPY start.sh /
-
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/murano/murano-engine/config-external.sh b/docker_templates/murano/murano-engine/config-external.sh
deleted file mode 100644
index 5d9a2da49..000000000
--- a/docker_templates/murano/murano-engine/config-external.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-SOURCE="/opt/kolla/murano/murano.conf"
-TARGET="/etc/murano/murano.conf"
-OWNER="murano"
-
-if [[ -f "$SOURCE" ]]; then
-    cp $SOURCE $TARGET
-    chown ${OWNER}: $TARGET
-    chmod 0644 $TARGET
-fi
diff --git a/docker_templates/murano/murano-engine/start.sh b/docker_templates/murano/murano-engine/start.sh
deleted file mode 100755
index 22834fc4c..000000000
--- a/docker_templates/murano/murano-engine/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/murano-engine"
-ARGS="--config-file /etc/murano/murano.conf"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS