Enable neutron dynamic routing agent
Support the neutron dynamic routing agent. A subsequent charm, neutron-dynamic-routing, will implement the agent. Neutron-api needs to enable the plugin and install the correct packages. Change-Id: I2c58bae47f672fe285b7fc59cd13636475d57ed2
This commit is contained in:
parent
892666557c
commit
96581bdc50
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ trusty/
|
||||
xenial/
|
||||
.stestr
|
||||
__pycache__
|
||||
func-results.json
|
||||
|
@ -476,9 +476,11 @@ class NeutronCCContext(context.NeutronContext):
|
||||
'ocata': ['router', 'firewall', 'vpnaas', 'metering',
|
||||
('neutron_lbaas.services.loadbalancer.plugin.'
|
||||
'LoadBalancerPluginv2'), 'segments'],
|
||||
'pike': ['router', 'firewall', 'metering',
|
||||
'pike': ['router', 'firewall', 'metering', 'segments',
|
||||
('neutron_lbaas.services.loadbalancer.plugin.'
|
||||
'LoadBalancerPluginv2'), 'segments'],
|
||||
'LoadBalancerPluginv2'),
|
||||
('neutron_dynamic_routing.'
|
||||
'services.bgp.bgp_plugin.BgpPlugin')],
|
||||
}
|
||||
ctxt['service_plugins'] = service_plugins.get(
|
||||
release, service_plugins['pike'])
|
||||
|
@ -388,6 +388,7 @@ def determine_packages(source=None):
|
||||
packages.extend(KILO_PACKAGES)
|
||||
if CompareOpenStackReleases(release) >= 'pike':
|
||||
packages.remove('python-neutron-vpnaas')
|
||||
packages.append('python-neutron-dynamic-routing')
|
||||
|
||||
if release == 'kilo' or CompareOpenStackReleases(release) >= 'mitaka':
|
||||
packages.append('python-networking-hyperv')
|
||||
|
@ -849,9 +849,9 @@ class NeutronCCContextTest(CharmTestCase):
|
||||
# pike
|
||||
self.os_release.return_value = 'pike'
|
||||
service_plugins = (
|
||||
'router,firewall,metering,'
|
||||
'router,firewall,metering,segments,'
|
||||
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'
|
||||
'segments')
|
||||
'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin')
|
||||
self.assertEqual(context.NeutronCCContext()()['service_plugins'],
|
||||
service_plugins)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user