From: Sage Weil <sage@redhat.com>
Date: Tue, 17 Dec 2019 15:51:06 +0000 (-0600)
Subject: cephadm: restart non-ceph daemons on reconfig
X-Git-Tag: v15.1.0~392^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1701498e236c39a21090958993d8612ffd93be3a;p=ceph.git

cephadm: restart non-ceph daemons on reconfig

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index fabcaf02b0093..2139b0af4ce34 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -977,11 +977,19 @@ def deploy_daemon(fsid, daemon_type, daemon_id, c, uid, gid,
             fsid, daemon_type, daemon_id,
             uid, gid,
             config, keyring)
+
     if not reconfig:
         deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
                             osd_fsid=osd_fsid)
+
     update_firewalld(daemon_type)
 
+    if reconfig and daemon_type not in Ceph.daemons:
+        # ceph daemons do not need a restart; others (presumably) do to pick
+        # up the new config
+        call_throws(['systemctl', 'restart',
+                     get_unit_name(fsid, daemon_type, daemon_id)])
+
 def deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
                         enable=True, start=True,
                         osd_fsid=None):