ceph-disk-prepare: always force mkfs.xfs

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>

diff --git a/src/ceph-disk-prepare b/src/ceph-disk-prepare
index 7dd1cba071734d7b5b43eb8dcc17e72ba7df2076..da63069909e928c3cc824eda346c717fcd485cc8 100755 (executable)
--- a/src/ceph-disk-prepare
+++ b/src/ceph-disk-prepare
@@ -640,6 +640,8 @@ def prepare_dev(
             ]
         if mkfs_args is not None:
             args.extend(mkfs_args.split())
+            #always force
+            args.extend(['-f'])
         else:
             args.extend(MKFS_ARGS.get(fstype, []))
         args.extend([
@@ -652,6 +654,10 @@ def prepare_dev(
         except subprocess.CalledProcessError as e:
             raise PrepareError(e)
 
+        #remove whitespaces from mount_options
+        if mount_options is not None:
+            mount_options = "".join(mount_options.split())
+
         path = mount(dev=dev, fstype=fstype, options=mount_options)
 
         try: