import quincy beta 17.1.0

[ceph.git] / ceph / src / python-common / ceph / deployment / translate.py

diff --git a/ceph/src/python-common/ceph/deployment/translate.py b/ceph/src/python-common/ceph/deployment/translate.py
index e5d59816626477877c132bbfce7ffb4a605bf4b2..6ca440cff3bf929a0b48e1c2150e21895b868cd7 100644 (file)
--- a/ceph/src/python-common/ceph/deployment/translate.py
+++ b/ceph/src/python-common/ceph/deployment/translate.py
@@ -36,7 +36,16 @@ class to_ceph_volume(object):
             return None
 
         cmd = ""
-        if self.spec.objectstore == 'filestore':
+        if self.spec.method == 'raw':
+            assert self.spec.objectstore == 'bluestore'
+            cmd = "raw prepare --bluestore"
+            cmd += " --data {}".format(" ".join(data_devices))
+            if db_devices:
+                cmd += " --block.db {}".format(" ".join(db_devices))
+            if wal_devices:
+                cmd += " --block.wal {}".format(" ".join(wal_devices))
+
+        elif self.spec.objectstore == 'filestore':
             cmd = "lvm batch --no-auto"
 
             cmd += " {}".format(" ".join(data_devices))
@@ -50,7 +59,7 @@ class to_ceph_volume(object):
 
             cmd += " --filestore"
 
-        if self.spec.objectstore == 'bluestore':
+        elif self.spec.objectstore == 'bluestore':
 
             cmd = "lvm batch --no-auto {}".format(" ".join(data_devices))
 
@@ -72,11 +81,15 @@ class to_ceph_volume(object):
         if self.spec.osds_per_device:
             cmd += " --osds-per-device {}".format(self.spec.osds_per_device)
 
+        if self.spec.data_allocate_fraction:
+            cmd += " --data-allocate-fraction {}".format(self.spec.data_allocate_fraction)
+
         if self.osd_id_claims:
             cmd += " --osd-ids {}".format(" ".join(self.osd_id_claims))
 
-        cmd += " --yes"
-        cmd += " --no-systemd"
+        if self.spec.method != 'raw':
+            cmd += " --yes"
+            cmd += " --no-systemd"
 
         if self.preview:
             cmd += " --report"