From 3046d4e94f48ce4ef199891253ef5943804760a3 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Thu, 27 Aug 2015 20:33:50 -0700 Subject: [PATCH] Keystone container listens on port 80 by default 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 --- docker/keystone/Dockerfile.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index a3b6861655..db5292399b 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -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'] %}