ceph-daemon: make rm-daemon reset-failed

We did this with rm-cluster and forgot to update rm-daemon too.  Also,
switch to call instead of call_throws.

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 62f678e3ca3fa3acc2eb2339428bb6492186627d..0aa57bb7f1265bc404223e6f07c4a5cf22c15a69 100755 (executable)
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1411,8 +1411,12 @@ def command_rm_daemon():
         raise RuntimeError('must pass --force to proceed: '
                            'this command may destroy precious data!')
     unit_name = get_unit_name(args.fsid, daemon_type, daemon_id)
-    call_throws(['systemctl', 'stop', unit_name])
-    call_throws(['systemctl', 'disable', unit_name])
+    call(['systemctl', 'stop', unit_name],
+         verbose_on_failure=False)
+    call(['systemctl', 'reset-failed', unit_name],
+         verbose_on_failure=False)
+    call(['systemctl', 'disable', unit_name],
+         verbose_on_failure=False)
     data_dir = get_data_dir(args.fsid, daemon_type, daemon_id)
     call_throws(['rm', '-rf', data_dir])