aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartosz Bezak <bartosz@stackhpc.com>2025-07-03 12:56:34 +0200
committerBartosz Bezak <bartosz@stackhpc.com>2025-07-04 10:01:14 +0200
commitbba9c3dd553abdfeb6017fa393007f6fbee13b3c (patch)
treeab428fe8defc747a014a0355847388f540824a29
parentb56331ca8e5fce8120cd3a8590f3e79021be3499 (diff)
downloadkolla-bba9c3dd553abdfeb6017fa393007f6fbee13b3c.tar.gz
kolla-bba9c3dd553abdfeb6017fa393007f6fbee13b3c.zip
zun: add wsgi script to use module paths
zun has moved to module paths [1]. [1] https://review.opendev.org/c/openstack/zun/+/953551 Change-Id: I81ad9c5bc404adfdc31eb50fd98e636ae5312eef Signed-off-by: Bartosz Bezak <bartosz@stackhpc.com>
-rw-r--r--docker/zun/zun-base/Dockerfile.j22
-rw-r--r--docker/zun/zun-base/app.wsgi2
2 files changed, 3 insertions, 1 deletions
diff --git a/docker/zun/zun-base/Dockerfile.j2 b/docker/zun/zun-base/Dockerfile.j2
index 908720b94..2d3cac741 100644
--- a/docker/zun/zun-base/Dockerfile.j2
+++ b/docker/zun/zun-base/Dockerfile.j2
@@ -37,12 +37,12 @@ ADD zun-base-archive /zun-base-source
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/ \
- && cp /zun/zun/api/app.wsgi /var/www/cgi-bin/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 \
diff --git a/docker/zun/zun-base/app.wsgi b/docker/zun/zun-base/app.wsgi
new file mode 100644
index 000000000..bd64371de
--- /dev/null
+++ b/docker/zun/zun-base/app.wsgi
@@ -0,0 +1,2 @@
+#!/var/lib/kolla/venv/bin/python
+from zun.wsgi.api import application