5 files changed, 0 insertions, 124 deletions
diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2
deleted file mode 100644
index 6ee37065a..000000000
--- a/docker/zaqar/zaqar-base/Dockerfile.j2
+++ /dev/null
@@ -1,72 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zaqar_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.configure_user(name='zaqar') }}
-
-{% if install_type == 'binary' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set zaqar_base_packages = [
-            'openstack-zaqar',
-        ] %}
-
-{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
-    && mkdir -p /var/www/cgi-bin/zaqar \
-    && chown -R zaqar: /var/www/cgi-bin/zaqar \
-    && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/
-
-    {% elif base_package_type == 'deb' %}
-        {% set zaqar_base_packages = [
-            'zaqar-common',
-        ] %}
-
-{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
-    && mkdir -p /var/www/cgi-bin/zaqar \
-    && chown -R zaqar: /var/www/cgi-bin/zaqar \
-    && cp -a /usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/
-    {% endif %}
-
-{% elif install_type == 'source' %}
-
-    {% if base_package_type == 'rpm' %}
-        {% set zaqar_base_packages = [
-        ] %}
-
-{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
-
-    {% elif base_package_type == 'deb' %}
-        {% set zaqar_base_packages = [
-        ] %}
-
-{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
-    {% endif %}
-
-{% set zaqar_base_pip_packages = [
-    'pymongo',
-    '/zaqar',
-    'gevent'
-] %}
-
-ADD zaqar-base-archive /zaqar-base-source
-
-RUN ln -s zaqar-base-source/* zaqar \
-    && {{ macros.install_pip(zaqar_base_pip_packages | customizable("pip_packages")) }} \
-    && mkdir -p /etc/zaqar /var/lib/zaqar /var/www/cgi-bin/zaqar \
-    && cp -r /zaqar/etc/* /etc/zaqar/ \
-    && cp /zaqar/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar \
-    && chown -R zaqar: /etc/zaqar /var/lib/zaqar /var/www/cgi-bin/zaqar
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_extend_start
-RUN touch /usr/local/bin/kolla_zaqar_extend_start \
-    && chmod 755 /var/www/cgi-bin/zaqar \
-    && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_zaqar_extend_start
-
-{% block zaqar_base_footer %}{% endblock %}
diff --git a/docker/zaqar/zaqar-base/extend_start.sh b/docker/zaqar/zaqar-base/extend_start.sh
deleted file mode 100644
index f696c024d..000000000
--- a/docker/zaqar/zaqar-base/extend_start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# Create log dir for Zaqar logs
-LOG_DIR="/var/log/kolla/zaqar"
-if [[ ! -d "${LOG_DIR}" ]]; then
-    mkdir -p ${LOG_DIR}
-fi
-if [[ $(stat -c %U:%G ${LOG_DIR}) != "zaqar:kolla" ]]; then
-    chown zaqar:kolla ${LOG_DIR}
-fi
-if [[ $(stat -c %a ${LOG_DIR}) != "755" ]]; then
-    chmod 755 ${LOG_DIR}
-fi
-
-. /usr/local/bin/kolla_zaqar_extend_start
diff --git a/docker/zaqar/zaqar-server/Dockerfile.j2 b/docker/zaqar/zaqar-server/Dockerfile.j2
deleted file mode 100644
index 6b607a1ec..000000000
--- a/docker/zaqar/zaqar-server/Dockerfile.j2
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zaqar_server_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_package_type == 'deb' %}
-        {% set zaqar_server_packages = ['zaqar-server'] %}
-
-{{ macros.install_packages(zaqar_server_packages | customizable("packages")) }}
-
-    {% endif %}
-{% endif %}
-
-{% block zaqar_server_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/zaqar/zaqar-wsgi/Dockerfile.j2 b/docker/zaqar/zaqar-wsgi/Dockerfile.j2
deleted file mode 100644
index c9640617f..000000000
--- a/docker/zaqar/zaqar-wsgi/Dockerfile.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zaqar-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zaqar_wsgi_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_zaqar_extend_start
-RUN chmod 755 /usr/local/bin/kolla_zaqar_extend_start
-
-{% block zaqar_wsgi_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/zaqar/zaqar-wsgi/extend_start.sh b/docker/zaqar/zaqar-wsgi/extend_start.sh
deleted file mode 100755
index c55f0b199..000000000
--- a/docker/zaqar/zaqar-wsgi/extend_start.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-. /usr/local/bin/kolla_httpd_setup