From 7de2e5202b9607fe1b5debb18a864920140bdbdf Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 3 Nov 2016 16:28:21 +0800 Subject: [PATCH] Fix keystone image building issue wsgi.py file is remove in O. should move to keystone-wsgi-admin and keystone-wsgi-public script. TrivialFix Change-Id: If86c407fd208adc5be6df54ac05dc39ee1cf757e --- docker/keystone/keystone-base/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index fe4c5cf1d7..28d6a0e1c2 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