From cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Sun, 27 Dec 2015 02:41:30 +0000 Subject: Fix pip install settings There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434 --- docker/keystone/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/keystone') diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 033385ee6..9754bd425 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 \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /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 \ -- cgit v1.2.3