diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-23 11:06:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-23 11:06:01 +0000 |
| commit | c53ec4e48884235566962bc934cbf292ad5b67b8 (patch) | |
| tree | 09f8bf7b7701c9327f76cbe031c5f5984a6bd010 | |
| parent | c4cd6ee4615a35a57dd6a2f3cb5a9cbc8653f7ee (diff) | |
| parent | 9af4c6115fcfce9c76a1e7fd5b93bb43cec66a4d (diff) | |
| download | nova-c53ec4e48884235566962bc934cbf292ad5b67b8.tar.gz | |
Merge "Change TooOldComputeService upgrade check code to failure"
| -rw-r--r-- | nova/cmd/status.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/cmd/test_status.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/too-old-compute-check-code-7dbcde45cfd23394.yaml | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nova/cmd/status.py b/nova/cmd/status.py index 8a7041b062..af62ee8401 100644 --- a/nova/cmd/status.py +++ b/nova/cmd/status.py @@ -319,7 +319,7 @@ class UpgradeCommands(upgradecheck.UpgradeCommands): try: utils.raise_if_old_compute() except exception.TooOldComputeService as e: - return upgradecheck.Result(upgradecheck.Code.WARNING, str(e)) + return upgradecheck.Result(upgradecheck.Code.FAILURE, str(e)) return upgradecheck.Result(upgradecheck.Code.SUCCESS) diff --git a/nova/tests/unit/cmd/test_status.py b/nova/tests/unit/cmd/test_status.py index 093b8ac16b..b61da4ae9f 100644 --- a/nova/tests/unit/cmd/test_status.py +++ b/nova/tests/unit/cmd/test_status.py @@ -474,7 +474,7 @@ class TestUpgradeCheckOldCompute(test.NoDBTestCase): "nova.objects.service.get_minimum_version_all_cells", return_value=too_old): result = self.cmd._check_old_computes() - self.assertEqual(upgradecheck.Code.WARNING, result.code) + self.assertEqual(upgradecheck.Code.FAILURE, result.code) class TestCheckMachineTypeUnset(test.NoDBTestCase): diff --git a/releasenotes/notes/too-old-compute-check-code-7dbcde45cfd23394.yaml b/releasenotes/notes/too-old-compute-check-code-7dbcde45cfd23394.yaml new file mode 100644 index 0000000000..f8e0517401 --- /dev/null +++ b/releasenotes/notes/too-old-compute-check-code-7dbcde45cfd23394.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + The upgrade check tooling now returns a non-zero exit code in the presence + of compute node services that are too old. This is to avoid situations in + which Nova control services fail to start after an upgrade. |