aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Bourke <paul.bourke@oracle.com>2015-10-15 11:01:12 +0100
committerPaul Bourke <paul.bourke@oracle.com>2015-10-15 11:08:49 +0000
commitbe8a3661843e855c2fc4d160782bc0d8782a8a6b (patch)
tree3467d5e4e8103081b9e5447d936480d312ca619e
parent72a8f5aabd31079d6fe8f0442a487689b4ba7bde (diff)
downloadkolla-be8a3661843e855c2fc4d160782bc0d8782a8a6b.tar.gz
kolla-be8a3661843e855c2fc4d160782bc0d8782a8a6b.zip
Use openstack/requirements for keystone
See Iccb4e99f8e4b6659a19c1817d0f4c697824af25c for context. Change-Id: Ic4f5732e70b0cda3b3755e8fe33ece3116fa8afc Partial-Bug: #150530
-rw-r--r--docker/keystone/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index bbea133d4..58975902c 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -38,7 +38,7 @@ RUN apt-get install -y --no-install-recommends \
ADD keystone-archive /keystone-source
RUN ln -s keystone-source/* keystone \
&& useradd --user-group keystone \
- && pip --no-cache-dir install /keystone \
+ && pip --no-cache-dir install -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 \