ceph-daemon: make id portion of 'shell' optional

This lets you start up a 'generic' container of a particular class,
without a data mount, but with the appropriate other mounts and privilege
levels.

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

diff --git a/src/ceph-daemon b/src/ceph-daemon
index 8d4db7289fbf9b10cda3790a38e675a5cdc48f77..f9240a202e65a9925c28468e4cf60dbb7f74478a 100755 (executable)
--- a/src/ceph-daemon
+++ b/src/ceph-daemon
@@ -88,10 +88,13 @@ def get_legacy_fsid(cluster):
 
 def get_daemon_args(fsid, daemon_type, daemon_id):
     r = [
-        '--default-admin-socket', '/var/run/ceph/' + fsid + '-' + daemon_type + '.' + daemon_id + '.asok',
         '--default-log-to-file=false',
         '--default-log-to-stderr=true',
         ]
+    if daemon_id:
+        r += ['--default-admin-socket',
+              '/var/run/ceph/' + fsid + '-' + daemon_type + '.' + daemon_id +
+              '.asok']
     r += ['--setuser', 'ceph']
     r += ['--setgroup', 'ceph']
     return r
@@ -604,7 +607,11 @@ def command_run():
 ##################################
 
 def command_shell():
-    (daemon_type, daemon_id) = args.name.split('.')
+    if '.' in args.name:
+        (daemon_type, daemon_id) = args.name.split('.')
+    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())