cephadm/box: revert ceph_volume

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/common.py b/src/ceph-volume/ceph_volume/devices/lvm/common.py
index fba659b8328b3ce2068955df24a9e1e9db270b95..05f83383f0ea13300e8a06abc117afa55295f914 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/common.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/common.py
@@ -123,12 +123,6 @@ bluestore_args = {
         'type': int,
         'default': 1,
     },
-    '--no-tmpfs': {
-        'action': 'store_true',
-        'dest': 'no_tmpfs',
-        'help': ('Disable tmpfs osd data directory with bluestore.'
-            'Useful if you want to run lvm preprare from cephadm'),
-    },
 }
 
 filestore_args = {

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index 6567c78d9f5ec790cbc449e0f4ebb198f444edea..2f715fdba122c8a87fc2a097a34df4c66c0766a1 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -81,7 +81,7 @@ def prepare_filestore(device, journal, secrets, tags, osd_id, fsid):
         )
 
 
-def prepare_bluestore(block, wal, db, secrets, tags, osd_id, fsid, tmpfs=True):
+def prepare_bluestore(block, wal, db, secrets, tags, osd_id, fsid):
     """
     :param block: The name of the logical volume for the bluestore data
     :param wal: a regular/plain disk or logical volume, to be used for block.wal
@@ -104,7 +104,7 @@ def prepare_bluestore(block, wal, db, secrets, tags, osd_id, fsid, tmpfs=True):
         db = prepare_dmcrypt(key, db, 'db', tags)
 
     # create the directory
-    prepare_utils.create_osd_path(osd_id, tmpfs=tmpfs)
+    prepare_utils.create_osd_path(osd_id, tmpfs=True)
     # symlink the block
     prepare_utils.link_block(block, osd_id)
     # get the latest monmap
@@ -384,8 +384,6 @@ class Prepare(object):
             tags['ceph.type'] = 'block'
             block_lv.set_tags(tags)
 
-            tmpfs = not self.args.no_tmpfs
-
             prepare_bluestore(
                 block_lv.lv_path,
                 wal_device,
@@ -394,7 +392,6 @@ class Prepare(object):
                 tags,
                 self.osd_id,
                 osd_fsid,
-                tmpfs=tmpfs
             )
 
     def main(self):