From: Michael Fritch <mfritch@suse.com>
Date: Mon, 18 May 2020 21:40:43 +0000 (-0600)
Subject: cephadm: fixup command_deploy log line
X-Git-Tag: v15.2.4~73^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35188%2Fhead;p=ceph.git

cephadm: fixup command_deploy log line

fixup log line to reflect the deploy action
(e.g. deploy, reconfig, redeploy)

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 2571d1bd6da97ff852d22d18f6bffb42b2180d23)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 7e159a6c1689..a8bb548ebfab 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2687,7 +2687,12 @@ def command_deploy():
     if state == 'running':
         redeploy = True
 
-    logger.info('Deploying daemon %s.%s ...' % (daemon_type, daemon_id))
+    if args.reconfig:
+        logger.info('%s daemon %s ...' % ('Reconfig', args.name))
+    elif redeploy:
+        logger.info('%s daemon %s ...' % ('Redeploy', args.name))
+    else:
+        logger.info('%s daemon %s ...' % ('Deploy', args.name))
 
     if daemon_type in Ceph.daemons:
         (config, keyring) = get_config_and_keyring()