From: Alfredo Deza <alfredo@deza.pe>
Date: Thu, 8 Aug 2013 23:09:26 +0000 (-0700)
Subject: make sure we are using the mount options
X-Git-Tag: v0.61.8~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1243c9749ed27850c5d041023780efcdf7b31a68;p=ceph.git

make sure we are using the mount options

Signed-off-by: Alfredo Deza <alfredo@deza.pe>
(cherry picked from commit 34831d0989d4bcec4920068b6ee09ab6b3234c91)
---

diff --git a/src/ceph-disk b/src/ceph-disk
index b4a9e68dad75..683553ae467a 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -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)