From e7040f55f01db3de7d5cebfc79de50c8b6ad5d45 Mon Sep 17 00:00:00 2001 From: Alexandre Marangone Date: Fri, 15 Feb 2013 12:22:33 -0800 Subject: [PATCH] ceph-disk-activate: pull mount options from ceph.conf Signed-off-by: Alexandre Marangone --- src/ceph-disk-activate | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) 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 -- 2.47.3