mgr/cephadm: make upgrade progress bar mention target version, not re…

…po digest The repo digest is super long and meaningless for a human user. Instead, use the target version (as soon as we know what it is--until then, use the target image name). Signed-off-by: Sage Weil <[email protected]>
trociny · Mar 26, 2021 · 521cb8a · 521cb8a
1 parent 0772593
commit 521cb8a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
@@ -295,7 +295,9 @@ def _update_upgrade_progress(self, progress: float) -> None:
             self.upgrade_state.progress_id = str(uuid.uuid4())
             self._save_upgrade_state()
         self.mgr.remote('progress', 'update', self.upgrade_state.progress_id,
-                        ev_msg='Upgrade to %s' % self.target_image,
+                        ev_msg='Upgrade to %s' % (
+                            self.upgrade_state.target_version or self.target_image
+                        ),
                         ev_progress=progress,
                         add_to_ceph_s=True)