Drop RetryFilter in Victoria inline with upstream
Change-Id: I77a25831efc409ec15aee91a1ca2cbec2a526e39 Closes-Bug: #1897331
This commit is contained in:
parent
c1b2ce0f0a
commit
2205b650f4
@ -359,6 +359,16 @@ _pike_enabled_filters = [
|
|||||||
"DifferentHostFilter",
|
"DifferentHostFilter",
|
||||||
"SameHostFilter",
|
"SameHostFilter",
|
||||||
]
|
]
|
||||||
|
_victoria_enabled_filters = [
|
||||||
|
"AvailabilityZoneFilter",
|
||||||
|
"ComputeFilter",
|
||||||
|
"ComputeCapabilitiesFilter",
|
||||||
|
"ImagePropertiesFilter",
|
||||||
|
"ServerGroupAntiAffinityFilter",
|
||||||
|
"ServerGroupAffinityFilter",
|
||||||
|
"DifferentHostFilter",
|
||||||
|
"SameHostFilter",
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
def default_enabled_filters():
|
def default_enabled_filters():
|
||||||
@ -370,6 +380,8 @@ def default_enabled_filters():
|
|||||||
"""
|
"""
|
||||||
os_rel = ch_utils.os_release('nova-common')
|
os_rel = ch_utils.os_release('nova-common')
|
||||||
cmp_os_rel = ch_utils.CompareOpenStackReleases(os_rel)
|
cmp_os_rel = ch_utils.CompareOpenStackReleases(os_rel)
|
||||||
|
if cmp_os_rel >= 'victoria':
|
||||||
|
return _victoria_enabled_filters
|
||||||
if cmp_os_rel >= 'pike':
|
if cmp_os_rel >= 'pike':
|
||||||
return _pike_enabled_filters
|
return _pike_enabled_filters
|
||||||
return _base_enabled_filters
|
return _base_enabled_filters
|
||||||
|
@ -693,3 +693,8 @@ class NovaComputeContextTests(CharmTestCase):
|
|||||||
self.os_release.return_value = 'rocky'
|
self.os_release.return_value = 'rocky'
|
||||||
self.assertEqual(context.default_enabled_filters(),
|
self.assertEqual(context.default_enabled_filters(),
|
||||||
context._pike_enabled_filters)
|
context._pike_enabled_filters)
|
||||||
|
|
||||||
|
def test_default_enabled_filters_victoria(self):
|
||||||
|
self.os_release.return_value = 'victoria'
|
||||||
|
self.assertEqual(context.default_enabled_filters(),
|
||||||
|
context._victoria_enabled_filters)
|
||||||
|
Loading…
Reference in New Issue
Block a user