diff options
| author | Zuul <zuul@review.opendev.org> | 2023-03-27 14:23:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-03-27 14:23:40 +0000 |
| commit | be0e89d600ddc6b20bb96cbd5f4a2ec899b7051f (patch) | |
| tree | b7370ebc6565ef0f29297b09995a89bc7a5d7e85 /docker | |
| parent | 503488d550518921dd2942e4e9d8f6348595aa9a (diff) | |
| parent | b2d5307a442994d1a9348926f0664bb94ef96248 (diff) | |
| download | kolla-be0e89d600ddc6b20bb96cbd5f4a2ec899b7051f.tar.gz kolla-be0e89d600ddc6b20bb96cbd5f4a2ec899b7051f.zip | |
Merge "neutron-mlnx-agent: pin pyzmq at 21.*"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 index ec7243e57..3b5aadaa2 100644 --- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 @@ -17,10 +17,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(neutron_mlnx_agent_packages | customizable("packages")) }} {% set neutron_mlnx_agent_pip_packages = [ - 'networking-mlnx' + 'networking-mlnx', ] %} -RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }} +{# NOTE(hrw): pyzmq 20 fails to build while 19.* and 21.* build fine. #} +RUN sed -e "s/^pyzmq===20.0.0/pyzmq==21.*/g" -i /requirements/upper-constraints.txt \ + && {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }} {% block neutron_mlnx_agent_footer %}{% endblock %} {% block footer %}{% endblock %} |