Drop hyperv mechanism driver and package
The networking-hyperv project is no longer maintained and has been removed from Ubuntu in Mantic. Closes-Bug: #2036953 Change-Id: Ib8e861377c9f691f31de0f707823dbf8ac0fde52
This commit is contained in:
parent
7a0925af7b
commit
a6c5567354
@ -196,7 +196,8 @@ def get_ml2_mechanism_drivers():
|
||||
]
|
||||
|
||||
cmp_release = CompareOpenStackReleases(os_release('neutron-server'))
|
||||
if (cmp_release == 'kilo' or cmp_release >= 'mitaka'):
|
||||
if (cmp_release == 'kilo' or
|
||||
cmp_release >= 'mitaka' and cmp_release <= 'antelope'):
|
||||
mechanism_drivers.append('hyperv')
|
||||
|
||||
if get_l2population():
|
||||
|
@ -467,6 +467,8 @@ def determine_packages(source=None, openstack_release=None):
|
||||
packages.append('python3-neutron-fwaas')
|
||||
if cmp_release >= 'train':
|
||||
packages.remove('python3-neutron-lbaas')
|
||||
if cmp_release >= 'bobcat':
|
||||
packages.remove('python3-networking-hyperv')
|
||||
|
||||
for v in resource_map().values():
|
||||
packages.extend(v['services'])
|
||||
|
@ -233,6 +233,11 @@ class GeneralTests(CharmTestCase):
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,l2population')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_bobcat(self):
|
||||
self.os_release.return_value = 'bobcat'
|
||||
self.assertEqual(context.get_ml2_mechanism_drivers(),
|
||||
'openvswitch,l2population')
|
||||
|
||||
def test_get_ml2_mechanism_drivers_no_l2pop(self):
|
||||
self.os_release.return_value = 'mitaka'
|
||||
self.test_config.set('l2-population', False)
|
||||
|
Loading…
x
Reference in New Issue
Block a user