Enable bgp dynamic routing for Ocata

Change-Id: I3bd3bc443d3007bceb80fafc6673d9c2a571975b
Needed-By: I00fd1d6098aee7f0e5287c8655dd9db843894a26
This commit is contained in:
David Ames 2018-07-10 11:51:24 -07:00
parent 7388359e42
commit d86000271a
3 changed files with 6 additions and 3 deletions

View File

@ -505,7 +505,9 @@ class NeutronCCContext(context.NeutronContext):
'LoadBalancerPluginv2')],
'ocata': ['router', 'firewall', 'vpnaas', 'metering',
('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2'), 'segments'],
'LoadBalancerPluginv2'), 'segments',
('neutron_dynamic_routing.'
'services.bgp.bgp_plugin.BgpPlugin')],
'pike': ['router', 'firewall', 'metering', 'segments',
('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2'),

View File

@ -386,7 +386,7 @@ def determine_packages(source=None):
if CompareOpenStackReleases(release) >= 'kilo':
packages.extend(KILO_PACKAGES)
if CompareOpenStackReleases(release) >= 'pike':
if CompareOpenStackReleases(release) >= 'ocata':
packages.remove('python-neutron-vpnaas')
packages.append('python-neutron-dynamic-routing')

View File

@ -889,7 +889,8 @@ class NeutronCCContextTest(CharmTestCase):
service_plugins = (
'router,firewall,vpnaas,metering,'
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'
'segments'
'segments,'
'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin'
)
self.assertEqual(context.NeutronCCContext()()['service_plugins'],
service_plugins)