From: Sage Weil <sage@newdream.net>
Date: Fri, 19 Mar 2021 14:31:24 +0000 (-0400)
Subject: mgr/cephadm/upgrade: include upgrade progress in ceph -s
X-Git-Tag: v16.2.0~73^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9bfbe6ae14d81316e4f0f4f1b6028901290b07b;p=ceph.git

mgr/cephadm/upgrade: include upgrade progress in ceph -s

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

diff --git a/src/pybind/mgr/cephadm/upgrade.py b/src/pybind/mgr/cephadm/upgrade.py
index cb47af306747..e7e6c1694eb4 100644
--- a/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@ -294,7 +294,8 @@ class CephadmUpgrade:
             self._save_upgrade_state()
         self.mgr.remote('progress', 'update', self.upgrade_state.progress_id,
                         ev_msg='Upgrade to %s' % self.target_image,
-                        ev_progress=progress)
+                        ev_progress=progress,
+                        add_to_ceph_s=True)
 
     def _save_upgrade_state(self) -> None:
         if not self.upgrade_state: