aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2025-12-05 10:40:50 +0000
committerGerrit Code Review <review@openstack.org>2025-12-05 10:40:50 +0000
commit93736f28eeab4d6f99cbfab77bdc7c72d24327f6 (patch)
tree6bed30972215f8ecc80ef7a4abb2d816d9d02459
parent2da1676d7a861ff921936443861559f1b994f776 (diff)
parent5ff768f0bdfadefaa32e69278dfdcafd2aa2b271 (diff)
downloadkolla-93736f28eeab4d6f99cbfab77bdc7c72d24327f6.tar.gz
kolla-93736f28eeab4d6f99cbfab77bdc7c72d24327f6.zip
Merge "neutron: Remove networking-generic-switch from u-c"
-rw-r--r--docker/neutron/neutron-base/Dockerfile.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index e3d19178d..956551fbd 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -78,6 +78,7 @@ RUN chmod +x /usr/local/lib/neutron-wrappers/copy-wrappers \
&& chmod +x /usr/local/lib/neutron-wrappers/delete-wrappers
RUN ln -s neutron-base-source/* neutron \
+ && {{ macros.upper_constraints_remove('networking-generic-switch') }} \
&& {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/neutron \
&& cp -r /neutron/etc/* /etc/neutron/ \