2 files changed, 0 insertions, 73 deletions
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
deleted file mode 100644
index fa5daad14..000000000
--- a/docker/dind/Dockerfile.j2
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block dind_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
-# Since the gate cannot do DinD on centos due to the age of the kernel, we don't
-# build a true DinD image. Should the time come that we get a newer kernel in
-# the centos gate and we want to do multinode we can populate this container
-RUN /bin/true
-
-{% elif base_package_type == 'deb' %}
-    {% set dind_packages = [
-         'btrfs-progs',
-         'docker.io',
-         'openssh-server'
-    ] %}
-
-    {% if install_type == 'binary' %}
-        {% set dind_packages = dind_packages + [
-             'python3-docker'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(dind_packages | customizable("packages")) }}
-
-    {% if install_type == 'source' %}
-
-        {% set dind_pip_packages = [
-            'docker'
-        ] %}
-
-RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }}
-    {% endif %}
-
-{% endif %}
-
-COPY start.sh /usr/local/bin/kolla_start
-RUN chmod 755 /usr/local/bin/kolla_start
-
-{% block dind_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/dind/start.sh b/docker/dind/start.sh
deleted file mode 100644
index 8d861f744..000000000
--- a/docker/dind/start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-
-# External processes will be occurring and we must wait for them
-while [[ ! -e "/kolla_dind_ready" ]]; do
-    sleep 1
-done
-
-docker daemon -s btrfs 2>&1 > docker.log &
-docker_pid=$!
-
-mkdir -p /var/run/sshd
-/usr/sbin/sshd -D 2>&1 > sshd.log &
-sshd_pid=$!
-
-mkdir -p /root/.ssh/
-echo "${SSH_PUB}" > /root/.ssh/authorized_keys
-
-# Wait for docker daemon
-sleep 5
-
-# Due to a quirk in the cloning method we end up with a bunch of dead containers
-docker rm -v -f $(docker ps -a --no-trunc -q)
-
-# Wait until child processes exit (they should never exit)
-wait