]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-disk: run ceph-osd when --mark-init=none
authorLoic Dachary <loic@dachary.org>
Mon, 30 Dec 2013 23:03:42 +0000 (00:03 +0100)
committerLoic Dachary <loic@dachary.org>
Fri, 3 Jan 2014 15:30:40 +0000 (16:30 +0100)
Signed-off-by: Loic Dachary <loic@dachary.org>
src/ceph-disk

index 2038e71a1ff13b5745630368b1cd11891f9c4667..f5ba04d8bccf4eb65e158d5f87ca1eba6079b4cf 100755 (executable)
@@ -1834,6 +1834,18 @@ def main_activate(args):
                 activate_key_template=args.activate_key_template,
                 init=args.mark_init,
                 )
+
+            if args.mark_init == 'none':
+                command_check_call(
+                    [
+                    'ceph-osd',
+                        '--cluster={cluster}'.format(cluster=cluster),
+                        '--id={osd_id}'.format(osd_id=osd_id),
+                        '--osd-data={path}'.format(path=args.path),
+                        '--osd-journal={path}/journal'.format(path=args.path),
+                    ],
+                )
+
         else:
             raise Error('%s is not a directory or block device' % args.path)