From 521cb8ab225561e0d29e215ffc63f293555ca00d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 25 Mar 2021 15:05:02 -0500 Subject: [PATCH] mgr/cephadm: make upgrade progress bar mention target version, not repo 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 --- src/pybind/mgr/cephadm/upgrade.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py index 45e2810c88325..3f4c09991e8eb 100644 --- a/src/pybind/mgr/cephadm/upgrade.py +++ b/src/pybind/mgr/cephadm/upgrade.py @@ -295,7 +295,9 @@ class CephadmUpgrade: 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) -- 2.39.5