diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-28 21:26:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-28 21:26:43 +0000 |
| commit | 8372adcf77338cc6370a78e588a9b2d2c08c08b0 (patch) | |
| tree | 7ac7bfb06a9a906e2d7b08367fb8e9cdb8cf1d4c /docker | |
| parent | 22fa0f9437dc94733241499628f0cf63ce66a215 (diff) | |
| parent | 3046d4e94f48ce4ef199891253ef5943804760a3 (diff) | |
| download | kolla-8372adcf77338cc6370a78e588a9b2d2c08c08b0.tar.gz kolla-8372adcf77338cc6370a78e588a9b2d2c08c08b0.zip | |
Merge "Keystone container listens on port 80 by default"
Diffstat (limited to 'docker')
| -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'] %} |