openstack
/
kolla
Code Issues Proposed changes

Merge "neutron-mlnx-agent: pin pyzmq at 21.*"

This commit is contained in:
Zuul 2023-03-27 14:23:40 +00:00 committed by Gerrit Code Review
parent 503488d550 b2d5307a44
commit be0e89d600
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/neutron/neutron-mlnx-agent/Dockerfile.j2
View File

@ -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 %}