diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 07:04:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 07:04:17 +0000 |
| commit | 16d772cd53dc896a2e6597e34074113710fd2a31 (patch) | |
| tree | ec3df60cc2ae36a9beaadece6a3192625203d261 | |
| parent | ac3ba89c8e1e51c312e2f4fda03ed4882a4097c4 (diff) | |
| parent | 7de2e5202b9607fe1b5debb18a864920140bdbdf (diff) | |
| download | kolla-16d772cd53dc896a2e6597e34074113710fd2a31.tar.gz kolla-16d772cd53dc896a2e6597e34074113710fd2a31.zip | |
Merge "Fix keystone image building issue"
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index fe4c5cf1d..28d6a0e1c 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -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 |