From: Alexandre Marangone <alexandre.marangone@inktank.com>
Date: Fri, 15 Feb 2013 20:22:33 +0000 (-0800)
Subject: ceph-disk-activate: pull mount options from ceph.conf
X-Git-Tag: v0.56.5~5^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d7084037d7a2395acfe8181f94963c1337c0f95b;p=ceph.git

ceph-disk-activate: pull mount options from ceph.conf

Signed-off-by: Alexandre Marangone <alexandre.marangone@inktank.com>
(cherry picked from commit e7040f55f01db3de7d5cebfc79de50c8b6ad5d45)
---

diff --git a/src/ceph-disk-activate b/src/ceph-disk-activate
index 0b3548abbdd5..1eb696490e39 100755
--- a/src/ceph-disk-activate
+++ b/src/ceph-disk-activate
@@ -455,15 +455,27 @@ def mount_activate(
             e,
             )
 
+    # TODO always using mount options from cluster=ceph for
+    # now; see http://tracker.newdream.net/issues/3253
     mount_options = get_conf(
-        # TODO always using mount options from cluster=ceph for
-        # now; see http://tracker.newdream.net/issues/3253
         cluster='ceph',
-        variable='osd_fs_mount_options_{fstype}'.format(
+        variable='osd_mount_options_{fstype}'.format(
             fstype=fstype,
             ),
         )
 
+    if mount_options is None:
+        mount_options = get_conf(
+            cluster='ceph',
+            variable='osd_fs_mount_options_{fstype}'.format(
+                fstype=fstype,
+                ),
+            )
+
+    #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)
 
     osd_id = None