From: Sage Weil <sage@redhat.com>
Date: Mon, 30 Sep 2019 18:04:24 +0000 (-0500)
Subject: ceph-daemon: --privileged arg for 'exec'
X-Git-Tag: v15.1.0~1313^2~53
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=68be44898b168e87527ef9a51ee657491e53096c;p=ceph-ci.git

ceph-daemon: --privileged arg for 'exec'

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 22ba52ecc0b..d3814fa821d 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -163,13 +163,13 @@ def get_container_mounts(fsid, daemon_type, daemon_id):
 
     return mounts
 
-def get_container(fsid, daemon_type, daemon_id):
+def get_container(fsid, daemon_type, daemon_id, privileged=False):
     if daemon_id:
         dname = daemon_type + '.' + daemon_id
     else:
         dname = daemon_type
     podman_args = []
-    if daemon_type == 'osd':
+    if daemon_type == 'osd' or privileged:
         podman_args += ['--privileged']
     return CephContainer(
         image=args.image,
@@ -659,7 +659,8 @@ 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)
+    c = get_container(args.fsid, daemon_type, daemon_id,
+                      privileged=args.privileged)
     subprocess.call(c.exec_cmd(args.command))
 
 ##################################
@@ -869,6 +870,10 @@ parser_exec.add_argument(
     '--name', '-n',
     required=True,
     help='daemon name (type.id)')
+parser_exec.add_argument(
+    '--privileged',
+    action='store_true',
+    help='use a privileged container')
 parser_exec.add_argument(
     'command', nargs='+',
     help='command')