aboutsummaryrefslogtreecommitdiff
path: root/docker/zun
diff options
context:
space:
mode:
Diffstat (limited to 'docker/zun')
-rw-r--r--docker/zun/zun-api/Dockerfile.j216
-rw-r--r--docker/zun/zun-api/extend_start.sh10
-rw-r--r--docker/zun/zun-base/Dockerfile.j256
-rw-r--r--docker/zun/zun-base/app.wsgi2
-rw-r--r--docker/zun/zun-base/extend_start.sh13
-rw-r--r--docker/zun/zun-base/zun_sudoers1
-rw-r--r--docker/zun/zun-cni-daemon/Dockerfile.j242
-rw-r--r--docker/zun/zun-cni-daemon/zun_sudoers1
-rw-r--r--docker/zun/zun-compute/Dockerfile.j237
-rw-r--r--docker/zun/zun-compute/extend_start.sh5
-rw-r--r--docker/zun/zun-compute/zun_sudoers3
-rw-r--r--docker/zun/zun-wsproxy/Dockerfile.j215
12 files changed, 0 insertions, 201 deletions
diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2
deleted file mode 100644
index ded752ae6..000000000
--- a/docker/zun/zun-api/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zun_api_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
-RUN chmod 644 /usr/local/bin/kolla_zun_extend_start
-
-{{ macros.kolla_patch_sources() }}
-
-{% block zun_api_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh
deleted file mode 100644
index f21cc1bd3..000000000
--- a/docker/zun/zun-api/extend_start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# 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
- zun-db-manage upgrade
- exit 0
-fi
-
-. /usr/local/bin/kolla_httpd_setup
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 *
diff --git a/docker/zun/zun-cni-daemon/Dockerfile.j2 b/docker/zun/zun-cni-daemon/Dockerfile.j2
deleted file mode 100644
index 3534f8f3e..000000000
--- a/docker/zun/zun-cni-daemon/Dockerfile.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zun_cni_daemon_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
- {% set zun_cni_daemon_packages = [
- 'openvswitch${KOLLA_RPM_OVS_VERSION}'
- ] %}
-
-{% elif base_package_type == 'deb' %}
-
- {% set zun_cni_daemon_packages = [
- 'bridge-utils',
- 'openvswitch-switch'
- ] %}
-
-{% endif %}
-{{ macros.install_packages(zun_cni_daemon_packages | customizable("packages")) }}
-
-{% block zun_cni_daemon_version %}
-ARG zun_cni_daemon_version=0.7.1
-ARG zun_cni_daemon_url=https://github.com/containernetworking/plugins/releases/download/v${zun_cni_daemon_version}/cni-plugins-{{debian_arch}}-v${zun_cni_daemon_version}.tgz
-{% endblock %}
-
-COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
-
-RUN chmod 750 /etc/sudoers.d \
- && chmod 640 /etc/sudoers.d/kolla_zun_sudoers \
- && curl -o /tmp/cni-plugins.tgz ${zun_cni_daemon_url} \
- && tar -C /opt -xzvf /tmp/cni-plugins.tgz ./loopback \
- && rm -f /tmp/cni-plugins.tgz
-
-{{ macros.kolla_patch_sources() }}
-
-{% block zun_cni_daemon_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/docker/zun/zun-cni-daemon/zun_sudoers b/docker/zun/zun-cni-daemon/zun_sudoers
deleted file mode 100644
index fd35f4cb5..000000000
--- a/docker/zun/zun-cni-daemon/zun_sudoers
+++ /dev/null
@@ -1 +0,0 @@
-zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf *
diff --git a/docker/zun/zun-compute/Dockerfile.j2 b/docker/zun/zun-compute/Dockerfile.j2
deleted file mode 100644
index e6c778f0b..000000000
--- a/docker/zun/zun-compute/Dockerfile.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zun_compute_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
-{{ macros.enable_extra_repos(['ceph', 'epel']) }}
-
-{% endif %}
-
-{% set zun_compute_packages = [
- 'ceph-common',
- 'e2fsprogs',
- 'pciutils',
- 'xfsprogs',
-] %}
-
-{{ macros.install_packages(zun_compute_packages | customizable("packages")) }}
-
-COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
-COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start
-
-RUN chmod 644 /usr/local/bin/kolla_zun_extend_start \
- && chmod 750 /etc/sudoers.d \
- && chmod 640 /etc/sudoers.d/kolla_zun_sudoers
-
-{{ macros.kolla_patch_sources() }}
-
-{% block zun_compute_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER zun
diff --git a/docker/zun/zun-compute/extend_start.sh b/docker/zun/zun-compute/extend_start.sh
deleted file mode 100644
index f3b6fc48b..000000000
--- a/docker/zun/zun-compute/extend_start.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-gid=$(stat -c "%g" /var/run/docker.sock)
-sudo groupadd --force --gid $gid docker
-sudo usermod -aG docker zun
diff --git a/docker/zun/zun-compute/zun_sudoers b/docker/zun/zun-compute/zun_sudoers
deleted file mode 100644
index b3a39af7d..000000000
--- a/docker/zun/zun-compute/zun_sudoers
+++ /dev/null
@@ -1,3 +0,0 @@
-zun ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/zun-rootwrap /etc/zun/rootwrap.conf *
-zun ALL=(root) NOPASSWD: /usr/sbin/groupadd --force --gid *
-zun ALL=(root) NOPASSWD: /usr/sbin/usermod -aG docker zun
diff --git a/docker/zun/zun-wsproxy/Dockerfile.j2 b/docker/zun/zun-wsproxy/Dockerfile.j2
deleted file mode 100644
index 09350ad40..000000000
--- a/docker/zun/zun-wsproxy/Dockerfile.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block zun_wsproxy_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{{ macros.kolla_patch_sources() }}
-
-{% block zun_wsproxy_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER zun
generated by cgit v1.2.3 (git 2.39.1) at 2026-11-05 16:14:22 +0000