diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-28 03:14:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-28 03:14:49 +0000 |
| commit | 70f74eb64101431e23d56c6a7df96d7aab37ce2f (patch) | |
| tree | a02f7437e1ce8fb4575bc6c45a7490f592444797 | |
| parent | 40e40b9045dbb6dc7426df0d84f79df6a9d8a48a (diff) | |
| parent | 9abe6d7997ab578d536fd215d6571487de7a09c6 (diff) | |
| download | kolla-70f74eb64101431e23d56c6a7df96d7aab37ce2f.tar.gz kolla-70f74eb64101431e23d56c6a7df96d7aab37ce2f.zip | |
Merge "Revert "neutron-mlnx-agent: pin pyzmq at 21.*""
| -rw-r--r-- | docker/neutron/neutron-mlnx-agent/Dockerfile.j2 | 4 |
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 %} |