From b6013977ccae757e64a4444bcaaf3e88e713b445 Mon Sep 17 00:00:00 2001 From: sunnyve Date: Thu, 4 Apr 2019 16:42:26 -0400 Subject: [PATCH] adding newton & above release support for nuage Nuage Networks Integration doesn't need to run nuage specific code within neutron-api starting from newton and above release. Change-Id: I34948e59ed27499d51933934263d1a42b015e5aa --- hooks/neutron_api_context.py | 2 +- hooks/neutron_api_utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/neutron_api_context.py b/hooks/neutron_api_context.py index 19872c5e..2248d855 100644 --- a/hooks/neutron_api_context.py +++ b/hooks/neutron_api_context.py @@ -408,7 +408,7 @@ class NeutronCCContext(context.NeutronContext): ctxt['external_network'] = config('neutron-external-network') release = os_release('neutron-server') cmp_release = CompareOpenStackReleases(release) - if config('neutron-plugin') in ['vsp']: + if config('neutron-plugin') == 'vsp' and cmp_release < 'newton': _config = config() for k, v in _config.items(): if k.startswith('vsd'): diff --git a/hooks/neutron_api_utils.py b/hooks/neutron_api_utils.py index 6be0e8dc..678ac505 100755 --- a/hooks/neutron_api_utils.py +++ b/hooks/neutron_api_utils.py @@ -409,7 +409,7 @@ def determine_packages(source=None): if release == 'kilo' or cmp_release >= 'mitaka': packages.append('python-networking-hyperv') - if config('neutron-plugin') == 'vsp': + if config('neutron-plugin') == 'vsp' and cmp_release < 'newton': nuage_pkgs = config('nuage-packages').split() packages.extend(nuage_pkgs)