From: Sage Weil <sage@redhat.com>
Date: Tue, 1 Oct 2019 16:09:07 +0000 (-0500)
Subject: ceph-daemon: drop useless uid/gid checks
X-Git-Tag: v15.1.0~1313^2~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=947a1ac2eabf95f6cd5454da96c417fe5f36654f;p=ceph.git

ceph-daemon: drop useless uid/gid checks

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index b575db456bd..6f38ea71854 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -658,11 +658,9 @@ def command_deploy():
 
 def command_run():
     (daemon_type, daemon_id) = args.name.split('.')
-    (uid, gid) = extract_uid_gid()
     c = get_container(args.fsid, daemon_type, daemon_id)
     subprocess.call(c.run_cmd())
 
-
 ##################################
 
 def command_shell():
@@ -671,7 +669,6 @@ def command_shell():
     else:
         daemon_type = args.name
         daemon_id = None
-    (uid, gid) = extract_uid_gid()
     c = get_container(args.fsid, daemon_type, daemon_id)
     subprocess.call(c.shell_cmd())
 
@@ -679,7 +676,6 @@ def command_shell():
 
 def command_enter():
     (daemon_type, daemon_id) = args.name.split('.')
-    (uid, gid) = extract_uid_gid()
     c = get_container(args.fsid, daemon_type, daemon_id)
     subprocess.call(c.exec_cmd(['bash']))
 
@@ -687,7 +683,6 @@ def command_enter():
 
 def command_exec():
     (daemon_type, daemon_id) = args.name.split('.')
-    (uid, gid) = extract_uid_gid()
     c = get_container(args.fsid, daemon_type, daemon_id,
                       privileged=args.privileged)
     subprocess.call(c.exec_cmd(args.command))