From 3e628eee770508e750f64ea50179bbce52e7b8e0 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 14 Mar 2013 12:04:44 -0700 Subject: [PATCH] Revert "ceph-disk-activate: don't override default or configured osd journal path" This reverts commit 813e9fe2b4291a1c1922ef78f031daa9b78fe53b. We run --mkfs with the osd disk mounted in a temporary location, so it is necessary to explicitly pass in these paths. If we want to support journals in a different location, we need to make ceph-disk-prepare update the journal symlink accordingly.. not control it via the config option. Signed-off-by: Sage Weil --- src/ceph-disk-activate | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate index ef5544ab071e7..d64e53e030694 100755 --- a/src/ceph-disk-activate +++ b/src/ceph-disk-activate @@ -234,6 +234,7 @@ def mkfs( '-i', osd_id, '--monmap', monmap, '--osd-data', path, + '--osd-journal', os.path.join(path, 'journal'), '--osd-uuid', fsid, ], ) -- 2.39.5