From aec0b95fa72689404cc15bd7a3e890d42b394dcd Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 17 Mar 2020 13:15:40 +0100 Subject: [PATCH] neutron: Remove networking-ovn - part 2 A followup to change [1]. Remove networking-ovn sources from kolla/common/config.py and neutron-db-manage call in neutron-server/extend_start.sh [1]: https://review.opendev.org/712762/ Change-Id: I976d60e5f2bf3e8a55b90485a77584d9e7579d62 --- docker/neutron/neutron-server/extend_start.sh | 1 - kolla/common/config.py | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/docker/neutron/neutron-server/extend_start.sh b/docker/neutron/neutron-server/extend_start.sh index e3af2ef85c..1a018a1b00 100644 --- a/docker/neutron/neutron-server/extend_start.sh +++ b/docker/neutron/neutron-server/extend_start.sh @@ -8,7 +8,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then neutron-db-manage ${OPTS} --subproject neutron-dynamic-routing upgrade head neutron-db-manage ${OPTS} --subproject neutron-fwaas upgrade head neutron-db-manage ${OPTS} --subproject neutron-vpnaas upgrade head - neutron-db-manage ${OPTS} --subproject networking-ovn upgrade head exit 0 fi diff --git a/kolla/common/config.py b/kolla/common/config.py index 2a5dcd2c2e..c086b6b15e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -590,10 +590,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/networking-mlnx/' 'networking-mlnx-${openstack_branch}.tar.gz')}, - 'neutron-base-plugin-networking-ovn': { - 'type': 'url', - 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-${openstack_branch}.tar.gz')}, 'neutron-base-plugin-networking-sfc': { 'type': 'url', 'location': ('$tarballs_base/networking-sfc/' @@ -638,14 +634,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/neutron-vpnaas/' 'neutron-vpnaas-${openstack_branch}.tar.gz')}, - 'neutron-server-ovn-plugin-networking-ovn': { - 'type': 'url', - 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-${openstack_branch}.tar.gz')}, - 'neutron-metadata-agent-ovn-plugin-networking-ovn': { - 'type': 'url', - 'location': ('$tarballs_base/networking-ovn/' - 'networking-ovn-${openstack_branch}.tar.gz')}, 'nova-base': { 'type': 'url', 'location': ('$tarballs_base/nova/'