From: Sage Weil <sage@redhat.com>
Date: Sat, 5 Oct 2019 19:16:11 +0000 (-0500)
Subject: ceph-daemon: -n type.id instead of -i id
X-Git-Tag: v15.1.0~1313^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F30603%2Fhead;p=ceph.git

ceph-daemon: -n type.id instead of -i id

This just makes for an easier-to-read '[podman] ps' output (easier to grep,
grok, etc.).

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index e7c608dc93bc..49843e07c9e3 100755
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -240,7 +240,7 @@ def get_container(fsid, daemon_type, daemon_id, privileged=False):
         image=args.image,
         entrypoint='/usr/bin/ceph-' + daemon_type,
         args=[
-            '-i', daemon_id,
+            '-n', '%s.%s' % (daemon_type, daemon_id),
             '-f', # foreground
         ] + get_daemon_args(fsid, daemon_type, daemon_id),
         podman_args=podman_args,