diff --git a/octavia/cmd/status.py b/octavia/cmd/status.py index f98d51dad4..e2877de360 100644 --- a/octavia/cmd/status.py +++ b/octavia/cmd/status.py @@ -77,9 +77,8 @@ class Checks(upgradecheck.UpgradeCommands): 'section.')) def _check_amphorav2(self): - default_provider_driver = CONF.api_settings.default_provider_driver enabled_provider_drivers = CONF.api_settings.enabled_provider_drivers - if (default_provider_driver == constants.AMPHORAV2 or + if (constants.AMPHORA in enabled_provider_drivers or constants.AMPHORAV2 in enabled_provider_drivers): persistence = self._check_persistence() if isinstance(persistence, upgradecheck.Result): diff --git a/octavia/tests/unit/cmd/test_status.py b/octavia/tests/unit/cmd/test_status.py index 94b39b6502..a74b5555f9 100644 --- a/octavia/tests/unit/cmd/test_status.py +++ b/octavia/tests/unit/cmd/test_status.py @@ -32,8 +32,8 @@ class TestUpgradeChecks(base.TestCase): def test__check_amphorav2_not_enabled(self): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) self.conf.config(group='api_settings', - default_provider_driver=constants.AMPHORA, - enabled_provider_drivers={constants.AMPHORA: "Test"}) + default_provider_driver='other_provider', + enabled_provider_drivers={'other_provider': "Test"}) check_result = self.cmd._check_amphorav2() self.assertEqual( Code.SUCCESS, check_result.code) diff --git a/releasenotes/notes/fix-octavia-status-amphorav2-038fe77a2189b99f.yaml b/releasenotes/notes/fix-octavia-status-amphorav2-038fe77a2189b99f.yaml new file mode 100644 index 0000000000..d20ffe5416 --- /dev/null +++ b/releasenotes/notes/fix-octavia-status-amphorav2-038fe77a2189b99f.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixed a bug in octavia-status which reported an incorrect status for the + *amphorav2* driver when using the default *amphora* alias.