openstack/kolla-ansible
Code Issues Proposed changes

Keystone container listens on port 80 by default

Browse Source 
A default configuration file is present in RPM distros which
listen to http on port 80 by default.

With this patch the keystone container works on centos+binary
where it did not previously.

Closes-Bug: 1490025

Change-Id: I4b5260200521e79d76eec324eb0ef026aa61b23d
This commit is contained in:
Steven Dake 2015-08-27 20:33:50 -07:00
parent 438599b79a
commit 3046d4e94f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/keystone/Dockerfile.j2
View File

@ -13,7 +13,8 @@ RUN yum -y install openstack-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/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin
&& cp -a /usr/share/keystone/keystone.wsgi /var/www/cgi-bin/keystone/admin \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
@ -36,7 +37,8 @@ RUN ln -s /etc/apache2/sites-available/wsgi-keystone.conf /etc/apache2/sites-ena
RUN yum -y install \
httpd \
mod_wsgi \
&& yum clean all
&& yum clean all \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf
{% elif base_distro in ['ubuntu', 'debian'] %}