From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Mar 2013 04:14:53 +0000 (-0700)
Subject: ceph-disk-activate: don't override default or configured osd journal path
X-Git-Tag: v0.56.5~5^2~51
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=897413f90c0e802c6824c0ee8d06bdae33979293;p=ceph.git

ceph-disk-activate: don't override default or configured osd journal path

There is no reason not to rely on the default or obey any configured
value here.

Fixes: #4031
Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 813e9fe2b4291a1c1922ef78f031daa9b78fe53b)
---

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index 1eb696490e39..75d745bfcac2 100755
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -234,7 +234,6 @@ def mkfs(
             '-i', osd_id,
             '--monmap', monmap,
             '--osd-data', path,
-            '--osd-journal', os.path.join(path, 'journal'),
             '--osd-uuid', fsid,
             '--keyring', os.path.join(path, 'keyring'),
             ],