openstack/charm-neutron-api
Code Issues Proposed changes

Merge "adding newton & above release support for nuage"

Browse Source
This commit is contained in:
Zuul 2019-05-24 08:52:35 +00:00 committed by Gerrit Code Review
commit 123f366fc5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/neutron_api_context.py
View File

@ -408,7 +408,7 @@ class NeutronCCContext(context.NeutronContext):
ctxt['external_network'] = config('neutron-external-network') ctxt['external_network'] = config('neutron-external-network')
release = os_release('neutron-server') release = os_release('neutron-server')
cmp_release = CompareOpenStackReleases(release) cmp_release = CompareOpenStackReleases(release)
if config('neutron-plugin') in ['vsp']: if config('neutron-plugin') == 'vsp' and cmp_release < 'newton':
_config = config() _config = config()
for k, v in _config.items(): for k, v in _config.items():
if k.startswith('vsd'): if k.startswith('vsd'):

2
hooks/neutron_api_utils.py
View File

@ -410,7 +410,7 @@ def determine_packages(source=None):
if release == 'kilo' or cmp_release >= 'mitaka': if release == 'kilo' or cmp_release >= 'mitaka':
packages.append('python-networking-hyperv') 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() nuage_pkgs = config('nuage-packages').split()
packages.extend(nuage_pkgs) packages.extend(nuage_pkgs)