diff options
| author | Zuul <zuul@review.opendev.org> | 2025-07-04 12:06:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-07-04 12:06:35 +0000 |
| commit | cb6ae7b6c5a25bce399da1c3da02e7782e8753be (patch) | |
| tree | 783071ce5716b6551cf6509d0c8ec4ce5b707b64 | |
| parent | 4c1ffa93ac77a20882dffb6ca9a85956060ef443 (diff) | |
| parent | bba9c3dd553abdfeb6017fa393007f6fbee13b3c (diff) | |
| download | kolla-cb6ae7b6c5a25bce399da1c3da02e7782e8753be.tar.gz kolla-cb6ae7b6c5a25bce399da1c3da02e7782e8753be.zip | |
Merge "zun: add wsgi script to use module paths"
| -rw-r--r-- | docker/zun/zun-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/zun/zun-base/app.wsgi | 2 |
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 |