Merge branch 'wip-shraddhaag-cephadm-crimson-tests' of https://github.com/shraddhaag...

diff --cc src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
index 575273140fba176dba6b960464245b88067ee156,d34e8cde06faad30094df645488ada90b4b31a71..0720602d8762c6ae7915845389e431c93f8c8138
--- 1/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
--- 2/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
+++ b/src/ceph-volume/ceph_volume/tests/objectstore/test_baseobjectstore.py
@@@ -116,25 -125,24 +126,44 @@@ class TestBaseObjectStore
                            '--setgroup', 'ceph']
  
      @patch('ceph_volume.conf.cluster', 'ceph')
 +    def test_build_osd_mkfs_cmd_disables_discard(self):
 +        bo = BaseObjectStore([])
 +        bo.osd_path = '/var/lib/ceph/osd/ceph-123/'
 +        bo.osd_fsid = 'abcd-1234'
 +        bo.objectstore = 'bluestore'
 +        bo.osd_id = '123'
 +        bo.monmap = '/etc/ceph/ceph.monmap'
 +        bo.skip_mkfs_discard = True
 +        result = bo.build_osd_mkfs_cmd()
 +
 +        assert result == ['ceph-osd',
 +                          '--cluster',
 +                          'ceph',
 +                          '--osd-objectstore',
 +                          'bluestore',
 +                          '--mkfs', '-i', '123',
 +                          '--monmap',
 +                          '/etc/ceph/ceph.monmap',
 +                          '--bdev-enable-discard', 'false',
++
+     def test_build_osd_mkfs_cmd_crimson(self):
+         bo = BaseObjectStore([])
+         bo.osd_path = '/var/lib/ceph/osd/ceph-123/'
+         bo.osd_fsid = 'abcd-1234'
+         bo.objectstore = 'my-fake-objectstore'
+         bo.osd_id = '123'
+         bo.monmap = '/etc/ceph/ceph.monmap'
+         bo.osd_type = 'crimson'
+         result = bo.build_osd_mkfs_cmd()
+ 
+         assert result == ['ceph-osd-crimson',
+                           '--cluster',
+                           'ceph',
+                           '--osd-objectstore',
+                           'my-fake-objectstore',
+                           '--mkfs', '-i', '123',
+                           '--monmap',
+                           '/etc/ceph/ceph.monmap',
                            '--keyfile', '-',
                            '--osd-data',
                            '/var/lib/ceph/osd/ceph-123/',
@@@ -235,4 -217,4 +264,4 @@@
          monkeypatch.setattr('ceph_volume.util.system.chown', lambda path: 0)
          self.b.get_osdspec_affinity = lambda: 'foo'
          self.b.add_objectstore_opts()
--        assert self.b.osd_mkfs_cmd == ['binary', 'arg1', '--osdspec-affinity', 'foo']
++        assert self.b.osd_mkfs_cmd == ['binary', 'arg1', '--osdspec-affinity', 'foo']