diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-08-06 15:57:47 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-08-07 07:50:14 +0000 |
| commit | bbc842720c0b56f79cf28e7156dd13ff8deb537f (patch) | |
| tree | afd2becc41dad423d24ad380a7f6c848dc50f49c /docker | |
| parent | 63c4202d207b6b4686156bca81c84ca756513f3c (diff) | |
| download | kolla-bbc842720c0b56f79cf28e7156dd13ff8deb537f.tar.gz kolla-bbc842720c0b56f79cf28e7156dd13ff8deb537f.zip | |
keystone: Add local wsgi file
It has been removed with I9fa7cd60bf27768db06f69681675fce2e55712af
Change-Id: Ib42be3d56bdb64247ac6f17b8ac1f1baa873f475
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker')
| -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 |