Revert "ceph-volume: no_tmpfs -> tmpfs"

This reverts commit 0092c5b603a3573a6ef9d8fc995d5f3ce74d90ac.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 69f14be35d805e5cf8e71cb9648c04de0a4df8b7..d1a5a4035ef52aeab6dd840ef98f8ff1b05141cb 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -121,7 +121,7 @@ def get_osd_device_path(osd_lv, lvs, device_type, dmcrypt_secret=None):
     raise RuntimeError('could not find %s with uuid %s' % (device_type, device_uuid))
 
 
-def activate_bluestore(lvs, no_systemd=False, tmpfs=True):
+def activate_bluestore(lvs, no_systemd=False, no_tmpfs=False):
     # find the osd
     osd_lv = lvs.get(lv_tags={'ceph.type': 'block'})
     if not osd_lv:
@@ -136,7 +136,7 @@ def activate_bluestore(lvs, no_systemd=False, tmpfs=True):
     osd_path = '/var/lib/ceph/osd/%s-%s' % (conf.cluster, osd_id)
     if not system.path_is_mounted(osd_path):
         # mkdir -p and mount as tmpfs
-        prepare_utils.create_osd_path(osd_id, tmpfs=tmpfs)
+        prepare_utils.create_osd_path(osd_id, tmpfs=(not no_tmpfs))
     # XXX This needs to be removed once ceph-bluestore-tool can deal with
     # symlinks that exist in the osd dir
     for link_name in ['block', 'block.db', 'block.wal']:
@@ -262,11 +262,11 @@ class Activate(object):
             logger.info('unable to find a journal associated with the OSD, assuming bluestore')
             return activate_bluestore(lvs,
                                       no_systemd=args.no_systemd,
-                                      tmpfs=(not args.no_tmpfs))
+                                      no_tmpfs=args.no_tmpfs)
         if args.bluestore:
             activate_bluestore(lvs,
                                no_systemd=args.no_systemd,
-                               tmpfs=(not args.no_tmpfs))
+                               no_tmpfs=args.no_tmpfs)
         elif args.filestore:
             activate_filestore(lvs, no_systemd=args.no_systemd)