Skip to content

Commit c21af67

Browse files
bbezakAlex-Welsh
authored andcommitted
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 <[email protected]> (cherry picked from commit bba9c3d)
1 parent f173f72 commit c21af67

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

docker/zun/zun-base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ ADD zun-base-archive /zun-base-source
3737

3838
COPY zun_sudoers /etc/sudoers.d/kolla_zun_sudoers
3939
COPY extend_start.sh /usr/local/bin/kolla_extend_start
40+
COPY app.wsgi /var/www/cgi-bin/zun
4041

4142
RUN ln -s zun-base-source/* zun \
4243
&& {{ macros.install_pip(zun_base_pip_packages | customizable("pip_packages")) }} \
4344
&& mkdir -p /etc/zun /var/www/cgi-bin/zun \
4445
&& cp -r /zun/etc/zun/* /etc/zun/ \
45-
&& cp /zun/zun/api/app.wsgi /var/www/cgi-bin/zun \
4646
&& 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 \
4747
&& chmod 750 /etc/sudoers.d \
4848
&& chmod 640 /etc/sudoers.d/kolla_zun_sudoers \

docker/zun/zun-base/app.wsgi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/var/lib/kolla/venv/bin/python
2+
from zun.wsgi.api import application

0 commit comments

Comments
 (0)