cephadm/box: add no-tmpfs flag prepare osd bluestore

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 752f354f35aacfab6aa63165ef589f6c1d1edd9f..b7ce6473dd7a85b9c0a19b632d1fb3f78405e912 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/common.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/common.py
@@ -123,6 +123,12 @@ 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 3121ede3bf51f4e60186426d5f477f11f334fa88..6567c78d9f5ec790cbc449e0f4ebb198f444edea 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):
+def prepare_bluestore(block, wal, db, secrets, tags, osd_id, fsid, tmpfs=True):
     """
     :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):
         db = prepare_dmcrypt(key, db, 'db', tags)
 
     # create the directory
-    prepare_utils.create_osd_path(osd_id, tmpfs=False)
+    prepare_utils.create_osd_path(osd_id, tmpfs=tmpfs)
     # symlink the block
     prepare_utils.link_block(block, osd_id)
     # get the latest monmap
@@ -384,6 +384,8 @@ 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,
@@ -392,6 +394,7 @@ class Prepare(object):
                 tags,
                 self.osd_id,
                 osd_fsid,
+                tmpfs=tmpfs
             )
 
     def main(self):

diff --git a/src/cephadm/box/start b/src/cephadm/box/start
index 7d12e41db41ec3868c7a61137a794c494f8f830f..b5883eeb932ccc700b3d0fb68ccbe722fdcea53f 100755 (executable)
--- a/src/cephadm/box/start
+++ b/src/cephadm/box/start
@@ -37,7 +37,7 @@ vgchange --refresh
 for((i=0;i<$NUM_OSDS;i++)); do
        echo "Creating osd.${i}"
        # create osd folder
-       $CEPHADM_PATH ceph-volume --shared_ceph_folder /ceph lvm create --bluestore --data "/dev/vg1/lv${i}" --no-systemd
+       $CEPHADM_PATH ceph-volume --shared_ceph_folder /ceph lvm create --bluestore --no-tmpfs --data "/dev/vg1/lv${i}" --no-systemd
        echo "Deploying osd.${i}..."
        # deploy osd with osd data folder
        $CEPHADM_PATH deploy --name "osd.${i}"