diff options
| author | Qiu Yu <qiuyu@ebaysf.com> | 2016-05-06 17:10:50 -0700 |
|---|---|---|
| committer | Qiu Yu <qiuyu@ebaysf.com> | 2016-05-03 12:51:21 -0700 |
| commit | 0a53d16b170f2f61cd9bd7ae4761ac35b918d5ca (patch) | |
| tree | d0b142113053d464b8c4d1e91e514078333ab492 | |
| parent | 33ab6f8cc1623fdded8aba7e3e581f20ac4b2819 (diff) | |
| download | kolla-0a53d16b170f2f61cd9bd7ae4761ac35b918d5ca.tar.gz kolla-0a53d16b170f2f61cd9bd7ae4761ac35b918d5ca.zip | |
Use updated wsgi file for Keystone 9.0.0 release
httpd/keystone.py is already deprecated in Keystone upstream[1] post
9.0.0 release. This change swiches to use keystone-wsgi-admin and
keystone-wsgi-public to match the upstream change.
[1] https://github.com/openstack/keystone/commit/70a42e7a82ddae9be75dba8f063170a1d13ce301
Change-Id: Iac3bb7309fc88c3e62bb2e92a3272545cbf9a778
Closes-Bug: #1579275
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index b37a21ff9..f7359dd25 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -56,8 +56,8 @@ RUN ln -s keystone-source/* keystone \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /keystone \ && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \ && cp -r /keystone/etc/* /etc/keystone/ \ - && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \ - && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/main \ + && cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ + && cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone {% endif %} |