Skip to content

Commit a9e56b7

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
keystone: Add local wsgi file
It has been removed with I9fa7cd60bf27768db06f69681675fce2e55712af Change-Id: Ib42be3d56bdb64247ac6f17b8ac1f1baa873f475 Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 3931f2d commit a9e56b7

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

docker/keystone/keystone-base/Dockerfile.j2

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
3333

3434
{% block keystone_source_install %}
3535
ADD keystone-base-archive /keystone-base-source
36+
ADD wsgi /var/lib/kolla/venv/bin/keystone-wsgi-public
3637

3738
{% set keystone_base_pip_packages = [
3839
'/keystone[ldap]',
3940
] %}
4041

4142
RUN ln -s keystone-base-source/* keystone \
4243
&& {{ macros.install_pip(keystone_base_pip_packages | customizable("pip_packages")) }} \
43-
&& mkdir -p /etc/keystone /var/www/cgi-bin/keystone \
44-
&& cp -r /keystone/etc/* /etc/keystone/ \
45-
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
46-
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main
44+
&& mkdir -p /etc/keystone \
45+
&& cp -r /keystone/etc/* /etc/keystone/
4746
{% endblock %}
4847

49-
RUN chmod 755 /var/www/cgi-bin/keystone/*
50-
5148
{{ macros.kolla_patch_sources() }}
5249

5350
{% block keystone_base_footer %}{% endblock %}

docker/keystone/keystone-base/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 keystone.wsgi.api import application

0 commit comments

Comments
 (0)