openstack/kolla
Code Issues Proposed changes

neutron-server: make it build again

Browse Source 
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
This commit is contained in:
Marcin Juszkiewicz 2021-03-01 14:14:59 +01:00
parent e9c11009f5
commit 8d70e3f0cc
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -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 = [

4
kolla/common/config.py
View File

@ -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/'