]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: fix exit code for run, shell, enter, exec
authorSage Weil <sage@redhat.com>
Wed, 23 Oct 2019 16:23:32 +0000 (11:23 -0500)
committerSage Weil <sage@redhat.com>
Wed, 23 Oct 2019 20:08:55 +0000 (15:08 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/ceph-daemon

index a5b67882e9e46f73c93840d04dac2ae5f1d51537..b3af0fffad9f81f39670059b8f4e00bb69d2501a 100755 (executable)
@@ -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))
 
 ##################################