openstack
/
kolla
Code Issues Proposed changes

Merge "Fix keystone image building issue"

This commit is contained in:
Jenkins 2016-11-04 07:04:17 +00:00 committed by Gerrit Code Review
parent ac3ba89c8e 7de2e5202b
commit 16d772cd53
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")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/keystone.wsgi /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-public /var/www/cgi-bin/keystone/main \
&& 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
{% 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")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/share/keystone/wsgi.py /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-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& echo > /etc/apache2/ports.conf \
&& rm /etc/apache2/sites-enabled/keystone.conf