From: Sage Weil <sage@newdream.net>
Date: Sat, 30 Jan 2021 22:35:21 +0000 (-0600)
Subject: mgr/cephadm/upgrade: tolerate pre-pacific upgrade state
X-Git-Tag: v17.1.0~3080^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0ff67b7ff321ed6e73ab19ea6282ebc75546b19;p=ceph.git

mgr/cephadm/upgrade: tolerate pre-pacific upgrade state

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index 1cc2cce6fde1..9d4954f269da 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