aboutsummaryrefslogtreecommitdiff
path: root/docker/neutron
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2025-12-04 11:56:01 +0100
committerMichal Nasiadka <mnasiadka@gmail.com>2025-12-05 07:40:18 +0000
commit5ff768f0bdfadefaa32e69278dfdcafd2aa2b271 (patch)
treee79039ae090a845b5c4fe255a5d8cfc86b820383 /docker/neutron
parentb013f9ad1dd7a70fc4607a363edeae085d08adf3 (diff)
downloadkolla-5ff768f0bdfadefaa32e69278dfdcafd2aa2b271.tar.gz
kolla-5ff768f0bdfadefaa32e69278dfdcafd2aa2b271.zip
neutron: Remove networking-generic-switch from u-c
networking-generic-switch was added to u-c [1] and it breaks our install scheme. Alternative is to remove networking-generic-switch from sources.py, but that would be a user facing change and if we would pursue that we would need to do the same for all neutron plugins. using u-c removal macro to preserve previous approach of installing n-g-s from a branch tarball compared to a pypi version [1]: https://review.opendev.org/c/openstack/requirements/+/964059 Change-Id: Ifcee01f9415e9b9de8138b55cd676873a99c86aa Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
Diffstat (limited to 'docker/neutron')
-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/ \