From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2020 16:07:12 +0000 (-0500)
Subject: mgr/cephadm: fix 'upgrade start' message when specifying a version
X-Git-Tag: v15.2.1~32^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4eaed9addc045d7751ccd955f834aef0dd69ce30;p=ceph.git

mgr/cephadm: fix 'upgrade start' message when specifying a version

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c6b0c28d748f7eec1455d00be15ab7f0b985ecf5)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 2ebf9d29bfdcf..4b361abb548fa 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -3114,7 +3114,7 @@ receivers:
         self._save_upgrade_state()
         self._clear_upgrade_health_checks()
         self.event.set()
-        return 'Initiating upgrade to %s' % (image)
+        return 'Initiating upgrade to %s' % (target_name)
 
     @trivial_completion
     def upgrade_pause(self):