openstack/charm-neutron-api
Code Issues Proposed changes

Fix service plugins for Queens release

Browse Source 
Introduction of the Octavia support for Rocky introduced a regression
for Queens deployments where the LBaaS v2 service plugin is dropped
from the service plugin list.

Provide an explicit list of service plugins for Queens to resolve
this issue.

Change-Id: I8527e68dca01723f6d9bf04b5fe1a605f967244a
Closes-Bug: 1805573
This commit is contained in:
James Page 2018-12-07 14:46:37 +00:00
parent 20ace1288c
commit 54fdd53b15
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/neutron_api_context.py
View File

@ -542,6 +542,11 @@ class NeutronCCContext(context.NeutronContext):
'LoadBalancerPluginv2'), 'LoadBalancerPluginv2'),
('neutron_dynamic_routing.' ('neutron_dynamic_routing.'
'services.bgp.bgp_plugin.BgpPlugin')], 'services.bgp.bgp_plugin.BgpPlugin')],
'queens': ['router', 'firewall', 'metering', 'segments',
('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2'),
('neutron_dynamic_routing.'
'services.bgp.bgp_plugin.BgpPlugin')],
'rocky': ['router', 'firewall', 'metering', 'segments', 'rocky': ['router', 'firewall', 'metering', 'segments',
('neutron_dynamic_routing.' ('neutron_dynamic_routing.'
'services.bgp.bgp_plugin.BgpPlugin')], 'services.bgp.bgp_plugin.BgpPlugin')],

8
unit_tests/test_neutron_api_context.py
View File

@ -913,6 +913,14 @@ class NeutronCCContextTest(CharmTestCase):
service_plugins) service_plugins)
# pike # pike
self.os_release.return_value = 'pike' self.os_release.return_value = 'pike'
service_plugins = (
'router,firewall,metering,segments,'
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'
'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin')
self.assertEqual(context.NeutronCCContext()()['service_plugins'],
service_plugins)
# queens
self.os_release.return_value = 'pike'
service_plugins = ( service_plugins = (
'router,firewall,metering,segments,' 'router,firewall,metering,segments,'
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,' 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'