]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
make sure we are using the mount options
authorAlfredo Deza <alfredo@deza.pe>
Thu, 8 Aug 2013 23:09:26 +0000 (16:09 -0700)
committerSage Weil <sage@inktank.com>
Fri, 9 Aug 2013 05:48:03 +0000 (22:48 -0700)
Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 34831d0989d4bcec4920068b6ee09ab6b3234c91)

src/ceph-disk

index b4a9e68dad7569406443eeeeabbeee21589deda6..683553ae467a2fca85145529d3a09e656deb7732 100755 (executable)
@@ -1326,6 +1326,7 @@ def move_mount(
     path,
     cluster,
     osd_id,
+    mount_options,
     ):
     LOG.debug('Moving mount to final location...')
     parent = '/var/lib/ceph/osd'
@@ -1344,6 +1345,8 @@ def move_mount(
     subprocess.check_call(
         args=[
             '/bin/mount',
+            '-o',
+            mount_options,
             '--',
             dev,
             osd_data,
@@ -1506,6 +1509,7 @@ def mount_activate(
                 path=path,
                 cluster=cluster,
                 osd_id=osd_id,
+                mount_options=mount_options,
                 )
         return (cluster, osd_id)