diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-29 02:37:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-29 02:37:59 +0000 |
| commit | beb8b7ddc4cf6cb4fd2425ded19531cb2304b42b (patch) | |
| tree | 0af29c5cd4c50a440a320123a735001ffe5d849a /docker/nova | |
| parent | 25a47ec9e54266ec866504820c38419d97776be1 (diff) | |
| parent | 44576361670deadfed68f5d516524d95e54461d5 (diff) | |
| download | kolla-beb8b7ddc4cf6cb4fd2425ded19531cb2304b42b.tar.gz kolla-beb8b7ddc4cf6cb4fd2425ded19531cb2304b42b.zip | |
Merge "Add missing contraints"
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 680c373e3..d4d738d71 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 /nova \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -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 40dfdf862..d9710e7ed 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 install --no-cache-dir libvirt-python +RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt libvirt-python {% endif %} |