diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-11 10:37:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-11 10:37:48 +0000 |
| commit | e2a7accaab62e03595d56ca34cc5ef1c16d81e2d (patch) | |
| tree | cb93b55013063adbf2fd29c1785b0d4223dfd49d /docker/keystone | |
| parent | cf3e68213edba3e74e74254676085999651a4361 (diff) | |
| parent | 0a53d16b170f2f61cd9bd7ae4761ac35b918d5ca (diff) | |
| download | kolla-e2a7accaab62e03595d56ca34cc5ef1c16d81e2d.tar.gz kolla-e2a7accaab62e03595d56ca34cc5ef1c16d81e2d.zip | |
Merge "Use updated wsgi file for Keystone 9.0.0 release"
Diffstat (limited to 'docker/keystone')
| -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 %} |