openstack/kolla-ansible
Code Issues Proposed changes

Fix keystone image building issue

Browse Source 
wsgi.py file is remove in O. should move to keystone-wsgi-admin and
keystone-wsgi-public script.

TrivialFix

Change-Id: If86c407fd208adc5be6df54ac05dc39ee1cf757e
This commit is contained in:
Jeffrey Zhang 2016-11-03 16:28:21 +08:00 committed by Jeffrey Zhang
parent 4d867f1fba
commit 7de2e5202b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -17,8 +17,8 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/main \ && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \ && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf && sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
@ -31,8 +31,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/main \ && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/share/keystone/wsgi.py /var/www/cgi-bin/keystone/admin \ && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& echo > /etc/apache2/ports.conf \ && echo > /etc/apache2/ports.conf \
&& rm /etc/apache2/sites-enabled/keystone.conf && rm /etc/apache2/sites-enabled/keystone.conf