diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-29 02:44:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-29 02:44:03 +0000 |
| commit | 83545d4f0d7b9917d98591933088291bfd06f9d6 (patch) | |
| tree | 30ef49530257510a505074cefd813e2339985757 /docker/nova | |
| parent | beb8b7ddc4cf6cb4fd2425ded19531cb2304b42b (diff) | |
| parent | cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 (diff) | |
| download | kolla-83545d4f0d7b9917d98591933088291bfd06f9d6.tar.gz kolla-83545d4f0d7b9917d98591933088291bfd06f9d6.zip | |
Merge "Fix pip install settings"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index d4d738d71..65666cc46 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN apt-get install -y --no-install-recommends \ ADD nova-base-archive /nova-base-source RUN ln -s nova-base-source/* nova \ && useradd --user-group nova \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /nova \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /nova \ && mkdir -p /etc/nova /var/log/nova /home/nova /var/lib/nova \ && cp -r /nova/etc/nova/* /etc/nova/ \ && chown -R nova: /etc/nova /var/log/nova /home/nova /var/lib/nova diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index d9710e7ed..650cf2942 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -34,7 +34,7 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt libvirt-python +RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python {% endif %} |