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

10 files changed, 153 insertions, 0 deletions

diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2
new file mode 100644
index 000000000..5bce3bdda
--- /dev/null
+++ b/docker/ironic/ironic-api/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-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-ironic-api \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/ironic/ironic-api/config-external.sh b/docker/ironic/ironic-api/config-external.sh
new file mode 100644
index 000000000..b838ee19d
--- /dev/null
+++ b/docker/ironic/ironic-api/config-external.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SOURCE="/opt/kolla/ironic-api/ironic.conf"
+TARGET="/etc/ironic/ironic.conf"
+OWNER="ironic"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/ironic/ironic-api/start.sh b/docker/ironic/ironic-api/start.sh
new file mode 100755
index 000000000..9d449defb
--- /dev/null
+++ b/docker/ironic/ironic-api/start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/ironic-api"
+ARGS=""
+
+source /opt/kolla/kolla-common.sh
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2
new file mode 100644
index 000000000..0fc7e56c2
--- /dev/null
+++ b/docker/ironic/ironic-base/Dockerfile.j2
@@ -0,0 +1,33 @@
+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'] %}
+
+# until packaging is fixed, all of this is required
+# api: policy
+# conductor:MySQL-python
+RUN yum -y install \
+        python-oslo-log \
+        python-oslo-concurrency \
+        python-oslo-policy \
+        MySQL-python \
+    && yum clean all
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+    {% endif %}
+{% elif install_type == 'source' %}
+
+ADD ironic.tar /
+RUN ln -s /ironic-* ironic \
+    && useradd --user-group ironic \
+    && pip --no-cache-dir install /ironic \
+    && mkdir -p /etc/ironic /var/log/ironic /home/ironic \
+    && cp -r /ironic/etc/* /etc/ironic/ \
+    && chown -R ironic: /etc/ironic /var/log/ironic /home/ironic
+
+{% endif %}
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
new file mode 100644
index 000000000..d38033230
--- /dev/null
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-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-ironic-conductor \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/ironic/ironic-conductor/config-external.sh b/docker/ironic/ironic-conductor/config-external.sh
new file mode 100644
index 000000000..b838ee19d
--- /dev/null
+++ b/docker/ironic/ironic-conductor/config-external.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SOURCE="/opt/kolla/ironic-api/ironic.conf"
+TARGET="/etc/ironic/ironic.conf"
+OWNER="ironic"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/ironic/ironic-conductor/start.sh b/docker/ironic/ironic-conductor/start.sh
new file mode 100755
index 000000000..c766f04c5
--- /dev/null
+++ b/docker/ironic/ironic-conductor/start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/ironic-conductor"
+ARGS=""
+
+source /opt/kolla/kolla-common.sh
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-discoverd/Dockerfile.j2
new file mode 100644
index 000000000..cb4e8b80f
--- /dev/null
+++ b/docker/ironic/ironic-discoverd/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ironic-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-ironic-discoverd \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/ironic/ironic-discoverd/config-external.sh b/docker/ironic/ironic-discoverd/config-external.sh
new file mode 100644
index 000000000..a3f82b8f3
--- /dev/null
+++ b/docker/ironic/ironic-discoverd/config-external.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SOURCE="/opt/kolla/ironic-discoverd/discoverd.conf"
+TARGET="/etc/ironic-discoverd/discoverd.conf"
+OWNER="ironic"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/ironic/ironic-discoverd/start.sh b/docker/ironic/ironic-discoverd/start.sh
new file mode 100755
index 000000000..093dc517a
--- /dev/null
+++ b/docker/ironic/ironic-discoverd/start.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -o errexit
+
+CMD="/usr/bin/ironic-discoverd"
+ARGS=""
+
+source /opt/kolla/kolla-common.sh
+set_configs
+
+exec $CMD $ARGS