diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 58f9c6c6e570d36b7e84dde3cf4a195bb83862a0..d95c8cb682e1ce77abc040f70568ea84ba2c077f 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -11,7 +11,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ ADD murano-base-archive /murano-base-source RUN ln -s murano-base-source/* murano \ && useradd --user-group murano \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install /murano \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /murano \ && mkdir -p /etc/murano /var/log/murano /home/murano \ && cp -r /murano/etc/murano/* /etc/murano/ \ && chown -R murano: /etc/murano /var/log/murano /home/murano diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index a13d3114d5033a6d61c75efc59564b523b9f7f94..391e21bd7ca66ae88ee4fc57411009b45c9e31ed 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 /neutron \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -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/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index 680c373e367d8e0d4f3e4718fa2ee4ed4a626e40..d4d738d71013c976466e41cb58ed746199735f35 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 40dfdf862594255dbc31a5c68001ba6e87769935..d9710e7ed60b3459b1d6636236a73fb15fef2cca 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 %} diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index d6afb2b24aced68e04462a6d193d6d3a94e96ea6..872ed57fe1dc6383a3f4ab8b2acf5ff1b5a73053 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -13,7 +13,7 @@ RUN yum -y install openstack-swift \ ADD swift-base-archive /swift-base-source RUN ln -s swift-base-source/* swift \ && useradd --user-group swift \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install /swift \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /swift \ && mkdir -p /etc/swift /var/log/swift /home/swift \ && cp -r /swift/etc/* /etc/swift/ \ && chown -R swift: /etc/swift /var/log/swift /home/swift diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2 index 796119e57de40d852e1eb847523e0c939c1f4ea3..caf2f9ef407dcfbfc777915b9e562c057fdc8165 100644 --- a/docker/zaqar/Dockerfile.j2 +++ b/docker/zaqar/Dockerfile.j2 @@ -13,7 +13,7 @@ RUN yum -y install openstack-zaqar \ ADD zaqar-archive /zaqar-source RUN ln -s zaqar-source/* zaqar \ && useradd --user-group zaqar \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install /zaqar \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /zaqar \ && mkdir -p /etc/zaqar /var/log/zaqar /home/zaqar \ && cp -r /zaqar/etc/* /etc/zaqar/ \ && chown -R zaqar: /etc/zaqar /var/log/zaqar /home/zaqar