diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-27 20:33:50 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-28 13:47:14 -0700 |
| commit | 3046d4e94f48ce4ef199891253ef5943804760a3 (patch) | |
| tree | 88a8a8a6a8fe638eee1fc69ac03af8b9b91deab7 | |
| parent | 438599b79a25eb9b71414a80f72ac329043430d6 (diff) | |
| download | kolla-3046d4e94f48ce4ef199891253ef5943804760a3.tar.gz kolla-3046d4e94f48ce4ef199891253ef5943804760a3.zip | |
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
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index a3b686165..db5292399 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'] %} |