aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-05-02 12:24:08 +0000
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-06-22 11:49:50 +0200
commit9abe6d7997ab578d536fd215d6571487de7a09c6 (patch)
tree3c7791db94747f583b3abae49e3c0c9a55f77f00
parentd88074b6238510daf9b0800efa27d7caccd7f080 (diff)
downloadkolla-9abe6d7997ab578d536fd215d6571487de7a09c6.tar.gz
kolla-9abe6d7997ab578d536fd215d6571487de7a09c6.zip
Revert "neutron-mlnx-agent: pin pyzmq at 21.*"
This reverts commit b2d5307a442994d1a9348926f0664bb94ef96248. Reason for revert: Bobcat uses 25+ version Change-Id: I589a5ae43ccf52104b8cbce327ab13248d3bbde0
-rw-r--r--docker/neutron/neutron-mlnx-agent/Dockerfile.j24
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2 b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
index d3a5d8a65..ed02be1f8 100644
--- a/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-mlnx-agent/Dockerfile.j2
@@ -20,9 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'networking-mlnx',
] %}
-{# NOTE(hrw): pyzmq 20 fails to build while 19.* and 21.* build fine. #}
-RUN {{ macros.upper_constraints_version_change("pyzmq", "20.0.0", "21.*") }} \
- && {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
+RUN {{ macros.install_pip(neutron_mlnx_agent_pip_packages | customizable("pip_packages")) }}
{% block neutron_mlnx_agent_footer %}{% endblock %}
{% block footer %}{% endblock %}