Fix service plugins for Queens release
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
(cherry picked from commit 54fdd53b15
)
This commit is contained in:
parent
04d60143a0
commit
191574e1ba
|
@ -542,6 +542,11 @@ class NeutronCCContext(context.NeutronContext):
|
|||
'LoadBalancerPluginv2'),
|
||||
('neutron_dynamic_routing.'
|
||||
'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',
|
||||
('neutron_dynamic_routing.'
|
||||
'services.bgp.bgp_plugin.BgpPlugin')],
|
||||
|
|
|
@ -913,6 +913,14 @@ class NeutronCCContextTest(CharmTestCase):
|
|||
service_plugins)
|
||||
# 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 = (
|
||||
'router,firewall,metering,segments,'
|
||||
'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2,'
|
||||
|
|
Loading…
Reference in New Issue