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/neutron | |
| 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/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 391e21bd7..2a4dad52b 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \ ADD neutron-base-archive /neutron-base-source RUN ln -s neutron-base-source/* neutron \ && useradd --user-group neutron \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /neutron \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron \ && mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \ && cp -r /neutron/etc/* /etc/neutron/ \ && cp -r /neutron/etc/neutron/* /etc/neutron/ \ diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index aa6f64e60..1562c24ed 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -5,7 +5,7 @@ ADD plugins-archive / COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start \ && if [[ "$(ls /plugins)" ]]; then \ - pip --no-cache-dir install -c requirements/upper-constraints.txt /plugins/*; \ + pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ fi {{ include_footer }} |