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

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit b0ff67b7ff321ed6e73ab19ea6282ebc75546b19)

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index 1cc2cce6fde1a02f529987626c75767a2036a21e..9d4954f269da4ffebf821f0366e0805de67bb32a 100644 (file)
--- 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