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 <sage@inktank.com>
(cherry picked from commit 3e628eee770508e750f64ea50179bbce52e7b8e0)

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index ef5544ab071e758031a0d4f568dc1f1e0d4bf3c9..d64e53e030694cb4fa9ae2eb0770f92fe619ea37 100755 (executable)
--- 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,
             ],
         )