diff --git a/hooks/neutron_api_context.py b/hooks/neutron_api_context.py index 86337ae8..13888ec6 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 5522571e..665c1e5e 100755 --- a/hooks/neutron_api_utils.py +++ b/hooks/neutron_api_utils.py @@ -410,7 +410,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)