4 files changed, 0 insertions, 72 deletions
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
deleted file mode 100644
index b6eac1907..000000000
--- a/docker/zun/zun-base/Dockerfile.j2
+++ /dev/null
@@ -1,56 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zun_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='zun') }}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['openvswitch']) }}
-
-    {% set zun_base_packages = [
-        'numactl',
-    ] %}
-
-{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/zun
-
-{% elif base_package_type == 'deb' %}
-
-    {% set zun_base_packages = [
-        'numactl',
-    ] %}
-
-{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
-RUN mkdir -p /var/www/cgi-bin/zun
-{% endif %}
-
-ADD zun-base-archive /zun-base-source
-
-{% set zun_base_pip_packages = [
-    '/zun'
-] %}
-
-COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-COPY app.wsgi /var/www/cgi-bin/zun
-
-RUN ln -s zun-base-source/* zun \
-    && {{ macros.install_pip(zun_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/zun /var/www/cgi-bin/zun \
-    && cp -r /zun/etc/zun/* /etc/zun/ \
-    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/zun/rootwrap.conf \
-    && chmod 750 /etc/sudoers.d \
-    && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \
-    && touch /usr/local/bin/kolla_zun_extend_start \
-    && chmod 755 /var/www/cgi-bin/zun \
-    && chmod 644 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zun_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block zun_base_footer %}{% endblock %}
diff --git a/docker/zun/zun-base/app.wsgi b/docker/zun/zun-base/app.wsgi
deleted file mode 100644
index bd64371de..000000000
--- a/docker/zun/zun-base/app.wsgi
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/var/lib/kolla/venv/bin/python
-from zun.wsgi.api import application
diff --git a/docker/zun/zun-base/extend_start.sh b/docker/zun/zun-base/extend_start.sh
deleted file mode 100644
index 0a8cf1331..000000000
--- a/docker/zun/zun-base/extend_start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ ! -d "/var/log/kolla/zun" ]]; then
-    mkdir -p /var/log/kolla/zun
-fi
-if [[ $(stat -c %U:%G /var/log/kolla/zun) != "zun:kolla" ]]; then
-    chown zun:kolla /var/log/kolla/zun
-fi
-if [[ $(stat -c %a /var/log/kolla/zun) != "755" ]]; then
-    chmod 755 /var/log/kolla/zun
-fi
-
-. /usr/local/bin/kolla_zun_extend_start
diff --git a/docker/zun/zun-base/zun_sudoers b/docker/zun/zun-base/zun_sudoers
deleted file mode 100644
index fd35f4cb5..000000000
--- a/docker/zun/zun-base/zun_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf *