From 8d70e3f0cc3681c6f786ccbe076cd6a028998857 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 1 Mar 2021 14:14:59 +0100 Subject: neutron-server: make it build again 1. stop pinning networking-hyperv Pike release was long time ago so maybe it is time to unpin it? commit 6dc8e978462fd08122133e273ae956721997d3af Author: Dan Ardelean Date: Mon Aug 28 12:56:25 2017 +0300 Change networking-hyperv version for Pike 2. stop install vmware-nsxlib as a plugin vmware-nsx is a plugin and we install it already vmware-nsxlib can be fetched from Pypi Solves: INFO:kolla.common.utils.neutron-server:The conflict is caused by: INFO:kolla.common.utils.neutron-server: The user requested vmware-nsxlib 15.0.8.dev129 (from /plugins/vmware-nsxlib-15.0.8.dev129) INFO:kolla.common.utils.neutron-server: vmware-nsx 15.0.1.dev424 depends on vmware-nsxlib>=17.0.0 Change-Id: I6ef344d463333e5cdc3a0850c8e068218779fdbd --- docker/neutron/neutron-server/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker') diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 169405148..c7f975fe4 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -28,7 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% set neutron_server_pip_packages = [ - '"networking-hyperv>=5.0.0,<6.0.0"' + 'networking-hyperv' ] %} {% set neutron_server_plugins_pip_packages = [ -- cgit v1.2.3