diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-03-01 14:14:59 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-03-01 14:30:59 +0100 |
| commit | 8d70e3f0cc3681c6f786ccbe076cd6a028998857 (patch) | |
| tree | c0ca6ef182fd23245396a3458bb2f4ef882fb738 | |
| parent | e9c11009f5f91f12711605d30e6562419fce1e06 (diff) | |
| download | kolla-8d70e3f0cc3681c6f786ccbe076cd6a028998857.tar.gz kolla-8d70e3f0cc3681c6f786ccbe076cd6a028998857.zip | |
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 <dardelean@cloudbasesolutions.com>
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
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 1 insertions, 5 deletions
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 = [ diff --git a/kolla/common/config.py b/kolla/common/config.py index 80274c3e3..a54520ba6 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -553,10 +553,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/neutron-dynamic-routing/' 'neutron-dynamic-routing-${openstack_branch}.tar.gz')}, - 'neutron-server-plugin-vmware-nsxlib': { - 'type': 'url', - 'location': ('$tarballs_base/x/vmware-nsxlib/' - 'vmware-nsxlib-${openstack_branch}.tar.gz')}, 'neutron-vpnaas-agent': { 'type': 'url', 'location': ('$tarballs_base/openstack/neutron-vpnaas/' |