From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 28 Aug 2015 12:16:53 +0000
Subject: 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
---
 docker/designate/designate-api/Dockerfile.j2       | 19 +++++++++++
 docker/designate/designate-api/config-external.sh  | 10 ++++++
 docker/designate/designate-api/start.sh            | 20 ++++++++++++
 .../designate-backend-bind9/Dockerfile.j2          | 19 +++++++++++
 .../designate-backend-bind9/config-external.sh     | 10 ++++++
 docker/designate/designate-backend-bind9/start.sh  | 13 ++++++++
 docker/designate/designate-base/Dockerfile.j2      | 37 ++++++++++++++++++++++
 docker/designate/designate-central/Dockerfile.j2   | 19 +++++++++++
 .../designate/designate-central/config-external.sh | 10 ++++++
 docker/designate/designate-central/start.sh        | 13 ++++++++
 docker/designate/designate-mdns/Dockerfile.j2      | 18 +++++++++++
 docker/designate/designate-mdns/config-external.sh | 10 ++++++
 docker/designate/designate-mdns/start.sh           | 13 ++++++++
 .../designate/designate-poolmanager/Dockerfile.j2  | 21 ++++++++++++
 .../designate-poolmanager/config-external.sh       | 10 ++++++
 docker/designate/designate-poolmanager/start.sh    | 13 ++++++++
 docker/designate/designate-sink/Dockerfile.j2      | 20 ++++++++++++
 docker/designate/designate-sink/config-external.sh | 10 ++++++
 docker/designate/designate-sink/start.sh           | 13 ++++++++
 19 files changed, 298 insertions(+)
 create mode 100644 docker/designate/designate-api/Dockerfile.j2
 create mode 100644 docker/designate/designate-api/config-external.sh
 create mode 100755 docker/designate/designate-api/start.sh
 create mode 100644 docker/designate/designate-backend-bind9/Dockerfile.j2
 create mode 100644 docker/designate/designate-backend-bind9/config-external.sh
 create mode 100755 docker/designate/designate-backend-bind9/start.sh
 create mode 100644 docker/designate/designate-base/Dockerfile.j2
 create mode 100644 docker/designate/designate-central/Dockerfile.j2
 create mode 100644 docker/designate/designate-central/config-external.sh
 create mode 100755 docker/designate/designate-central/start.sh
 create mode 100644 docker/designate/designate-mdns/Dockerfile.j2
 create mode 100644 docker/designate/designate-mdns/config-external.sh
 create mode 100755 docker/designate/designate-mdns/start.sh
 create mode 100644 docker/designate/designate-poolmanager/Dockerfile.j2
 create mode 100644 docker/designate/designate-poolmanager/config-external.sh
 create mode 100755 docker/designate/designate-poolmanager/start.sh
 create mode 100644 docker/designate/designate-sink/Dockerfile.j2
 create mode 100644 docker/designate/designate-sink/config-external.sh
 create mode 100755 docker/designate/designate-sink/start.sh

(limited to 'docker/designate')

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
new file mode 100644
index 000000000..75f4b06ee
--- /dev/null
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+RUN yum install -y \
+    openstack-designate-api \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-api/config-external.sh b/docker/designate/designate-api/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-api/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-api/start.sh b/docker/designate/designate-api/start.sh
new file mode 100755
index 000000000..fe556225b
--- /dev/null
+++ b/docker/designate/designate-api/start.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-api"
+ARGS=""
+
+# 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 "designate-manage db_sync" designate
+    exit 0
+fi
+
+exec $CMD $ARGS
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
new file mode 100644
index 000000000..06f86c043
--- /dev/null
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+RUN yum install -y bind \
+    && yum clean all \
+    && cp -pr /var/named /opt/kolla/var-named
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-backend-bind9/config-external.sh b/docker/designate/designate-backend-bind9/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-backend-bind9/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-backend-bind9/start.sh b/docker/designate/designate-backend-bind9/start.sh
new file mode 100755
index 000000000..11922974a
--- /dev/null
+++ b/docker/designate/designate-backend-bind9/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/sbin/named"
+ARGS="-u named -g"
+
+# Execute config strategy
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
new file mode 100644
index 000000000..3fec3a6f7
--- /dev/null
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -0,0 +1,37 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+# Install designate-api because of /etc/designate/policy.json, which
+# is needed in all services. This is probably a packaging bug. We do
+# need the complete policy file because of some of the containers'
+# requiring it. Remove the package when the file is moved though.
+RUN yum install -y \
+    MySQL-python \
+    openstack-designate-api \
+    openstack-designate-common \
+    python-tooz \
+    && yum clean all \
+    && cp /etc/designate/policy.json /tmp/ \
+    && rpm -e openstack-designate-api \
+    && mv /tmp/policy.json /etc/designate/
+
+    {% elif base_distro in ['ubuntu', 'debian'] %}
+
+RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+    {% endif %}
+{% elif install_type == 'source' %}
+
+ADD designate.tar /
+RUN ln -s /designate-* designate \
+    && useradd --user-group designate \
+    && pip --no-cache-dir install /designate \
+    && mkdir -p /etc/designate /var/log/designate /home/designate \
+    && cp -r /designate/etc/designate/* /etc/designate/ \
+    && chown -R designate: /etc/designate /var/log/designate /home/designate
+
+{% endif %}
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
new file mode 100644
index 000000000..771ff3c68
--- /dev/null
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -0,0 +1,19 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+RUN yum install -y \
+    openstack-designate-central \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-central/config-external.sh b/docker/designate/designate-central/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-central/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-central/start.sh b/docker/designate/designate-central/start.sh
new file mode 100755
index 000000000..eac012d3d
--- /dev/null
+++ b/docker/designate/designate-central/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-central"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
new file mode 100644
index 000000000..cc5f5fb89
--- /dev/null
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -0,0 +1,18 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+RUN yum install -y openstack-designate-mdns \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-mdns/config-external.sh b/docker/designate/designate-mdns/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-mdns/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-mdns/start.sh b/docker/designate/designate-mdns/start.sh
new file mode 100755
index 000000000..b4bcda20c
--- /dev/null
+++ b/docker/designate/designate-mdns/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-mdns"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
new file mode 100644
index 000000000..0fc968b90
--- /dev/null
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -0,0 +1,21 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+# The bind9 package here is only to provide the rndc binary.
+RUN yum install -y \
+    openstack-designate-pool-manager \
+    bind \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-poolmanager/config-external.sh b/docker/designate/designate-poolmanager/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-poolmanager/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-poolmanager/start.sh b/docker/designate/designate-poolmanager/start.sh
new file mode 100755
index 000000000..0752b9847
--- /dev/null
+++ b/docker/designate/designate-poolmanager/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-pool-manager"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
new file mode 100644
index 000000000..c0ea23b2d
--- /dev/null
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -0,0 +1,20 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-designate-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
+
+RUN yum install -y \
+    openstack-designate-sink \
+    python-designateclient \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+COPY start.sh /start.sh
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/designate/designate-sink/config-external.sh b/docker/designate/designate-sink/config-external.sh
new file mode 100644
index 000000000..ce302ea0c
--- /dev/null
+++ b/docker/designate/designate-sink/config-external.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+SOURCE="/opt/kolla/designate/designate.conf"
+TARGET="/etc/designate/designate.conf"
+OWNER="designate"
+
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
+fi
diff --git a/docker/designate/designate-sink/start.sh b/docker/designate/designate-sink/start.sh
new file mode 100755
index 000000000..d2f93e26f
--- /dev/null
+++ b/docker/designate/designate-sink/start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -o errexit
+CMD="/usr/bin/designate-sink"
+ARGS=""
+
+# Loading common functions.
+source /opt/kolla/kolla-common.sh
+
+# Execute config strategy
+set_configs
+
+exec $CMD $ARGS
-- 
cgit v1.2.3