From b0ff67b7ff321ed6e73ab19ea6282ebc75546b19 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 30 Jan 2021 16:35:21 -0600 Subject: [PATCH] mgr/cephadm/upgrade: tolerate pre-pacific upgrade state Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/upgrade.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index 1cc2cce6fde..9d4954f269d 100644 --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@ -51,7 +51,10 @@ class UpgradeState: @classmethod def from_json(cls, data: dict) -> Optional['UpgradeState']: if data: - return cls(**data) + c = {k: v for k, v in data.items()} + if 'repo_digest' in c: + c['target_digests'] = [c.pop('repo_digest')] + return cls(**c) else: return None -- 2.47.3