diff options
| author | SamYaple <sam@yaple.net> | 2015-12-27 02:41:30 +0000 |
|---|---|---|
| committer | SamYaple <sam@yaple.net> | 2015-12-27 03:35:35 +0000 |
| commit | cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 (patch) | |
| tree | 6479fa1fe24ec8adf078253ff95b34b136dda9dc /docker/glance | |
| parent | 44576361670deadfed68f5d516524d95e54461d5 (diff) | |
| download | kolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.tar.gz kolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.zip | |
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
Diffstat (limited to 'docker/glance')
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
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 |