From: Sage Weil <sage@redhat.com>
Date: Wed, 23 Oct 2019 16:23:32 +0000 (-0500)
Subject: ceph-daemon: fix exit code for run, shell, enter, exec
X-Git-Tag: v15.1.0~1179^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9c3e270eec39e8c30fec723cce7ec81ad746b9b0;p=ceph.git

ceph-daemon: fix exit code for run, shell, enter, exec

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index a5b67882e9e4..b3af0fffad9f 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -1071,7 +1071,7 @@ def command_deploy():
 def command_run():
     (daemon_type, daemon_id) = args.name.split('.')
     c = get_container(args.fsid, daemon_type, daemon_id)
-    subprocess.call(c.run_cmd())
+    return subprocess.call(c.run_cmd())
 
 ##################################
 
@@ -1098,14 +1098,14 @@ def command_shell():
         args=[],
         podman_args=['--privileged'],
         volume_mounts=mounts)
-    subprocess.call(c.shell_cmd(args.command))
+    return subprocess.call(c.shell_cmd(args.command))
 
 ##################################
 
 def command_enter():
     (daemon_type, daemon_id) = args.name.split('.')
     c = get_container(args.fsid, daemon_type, daemon_id)
-    subprocess.call(c.exec_cmd(args.command))
+    return subprocess.call(c.exec_cmd(args.command))
 
 ##################################
 
@@ -1113,7 +1113,7 @@ def command_exec():
     (daemon_type, daemon_id) = args.name.split('.')
     c = get_container(args.fsid, daemon_type, daemon_id,
                       privileged=args.privileged)
-    subprocess.call(c.exec_cmd(args.command))
+    return subprocess.call(c.exec_cmd(args.command))
 
 ##################################