From: Alexandre Marangone <alexandre.marangone@inktank.com>
Date: Fri, 15 Feb 2013 20:24:01 +0000 (-0800)
Subject: ceph-disk-prepare: always force mkfs.xfs
X-Git-Tag: v0.58~51^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d950d83250db3a179c4b629fd32cd7bc8149997e;p=ceph.git

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 7dd1cba07173..da63069909e9 100755
--- 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: