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/openstack-base/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/openstack-base/Dockerfile.j2') diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 7d87a4bd2..964b8b67c 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -79,9 +79,9 @@ RUN ln -s openstack-base-source/* /requirements \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ && rm get-pip.py \ - && pip install -U virtualenv \ - && virtualenv /var/lib/kolla/venv \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -U -c requirements/upper-constraints.txt \ + && pip --no-cache-dir install -U virtualenv \ + && virtualenv --system-site-packages /var/lib/kolla/venv \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \ jinja2 \ kazoo \ python-barbicanclient \ -- cgit v1.2.3