diff options
| author | Zuul <zuul@review.opendev.org> | 2025-08-07 11:30:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-08-07 11:30:48 +0000 |
| commit | 946a4133a994b836e3c3a02facfc3ba433aaebf5 (patch) | |
| tree | cb8838334c2336f20b7f0172f35c43e4649df6b4 | |
| parent | 8dbb71b70ce32b86c3a220439739f522605251f8 (diff) | |
| parent | bbc842720c0b56f79cf28e7156dd13ff8deb537f (diff) | |
| download | kolla-946a4133a994b836e3c3a02facfc3ba433aaebf5.tar.gz kolla-946a4133a994b836e3c3a02facfc3ba433aaebf5.zip | |
Merge "keystone: Add local wsgi file"
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/keystone/keystone-base/wsgi | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 8996a8e75..128c84148 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -33,6 +33,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block keystone_source_install %} ADD keystone-base-archive /keystone-base-source +ADD wsgi /var/lib/kolla/venv/bin/keystone-wsgi-public {% set keystone_base_pip_packages = [ '/keystone[ldap]', @@ -40,14 +41,10 @@ ADD keystone-base-archive /keystone-base-source RUN ln -s keystone-base-source/* keystone \ && {{ macros.install_pip(keystone_base_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/keystone /var/www/cgi-bin/keystone \ - && cp -r /keystone/etc/* /etc/keystone/ \ - && cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ - && cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main + && mkdir -p /etc/keystone \ + && cp -r /keystone/etc/* /etc/keystone/ {% endblock %} -RUN chmod 755 /var/www/cgi-bin/keystone/* - {{ macros.kolla_patch_sources() }} {% block keystone_base_footer %}{% endblock %} diff --git a/docker/keystone/keystone-base/wsgi b/docker/keystone/keystone-base/wsgi new file mode 100644 index 000000000..852ee95eb --- /dev/null +++ b/docker/keystone/keystone-base/wsgi @@ -0,0 +1,2 @@ +#!/var/lib/kolla/venv/bin/python +from keystone.wsgi.api import application |