From: Loic Dachary <loic@dachary.org>
Date: Mon, 30 Dec 2013 23:03:42 +0000 (+0100)
Subject: ceph-disk: run ceph-osd when --mark-init=none
X-Git-Tag: v0.67.6~1^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c473c65d4b6235fe20a97bd1d4741c12f86858e8;p=ceph.git

ceph-disk: run ceph-osd when --mark-init=none

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit 0fcc081858fae4febbb6a613a93cfbbcedd5a320)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index 8566f71ead4..9d76a4bdd56 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1837,6 +1837,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)