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/glance/glance-base/Dockerfile.j2 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/glance') diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index 1e8e9838b..8a893ad02 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -37,8 +37,7 @@ RUN apt-get install -y --no-install-recommends \ ADD glance-base-archive /glance-base-source RUN ln -s glance-base-source/* glance \ && useradd --user-group glance \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /glance \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install python-cephlibs /glance \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /glance \ && mkdir -p /etc/glance /var/log/glance /var/lib/glance /home/glance \ && cp -r /glance/etc/* /etc/glance/ \ && chown -R glance: /etc/glance /var/log/glance /var/lib/glance /home/glance -- cgit v1.2.3