summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-08-08 18:06:16 -0700
committerSage Weil <sage@inktank.com>2013-08-08 18:06:16 -0700
commit5bdbe9d617d6d9a00026b3b65833c4338bc9541f (patch)
tree96a2bacd90563284fca85c5c7beb236a26b9bd39
parent2e9c25f5ae675fcca38c895e07902eaa08b880ea (diff)
parent34831d0989d4bcec4920068b6ee09ab6b3234c91 (diff)
downloadceph-5bdbe9d617d6d9a00026b3b65833c4338bc9541f.tar.gz
Merge pull request #489 from ceph/wip-5903
make sure we are using the mount options Backport: dumpling, cuttlefish Reviewed-by: Sage Weil <sage@inktank.com>
-rwxr-xr-xsrc/ceph-disk4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ceph-disk b/src/ceph-disk
index 77a9d9a2612..e34faaf0689 100755
--- a/src/ceph-disk
+++ b/src/ceph-disk
@@ -1345,6 +1345,7 @@ def move_mount(
path,
cluster,
osd_id,
+ mount_options,
):
LOG.debug('Moving mount to final location...')
parent = '/var/lib/ceph/osd'
@@ -1363,6 +1364,8 @@ def move_mount(
subprocess.check_call(
args=[
'/bin/mount',
+ '-o',
+ mount_options,
'--',
dev,
osd_data,
@@ -1525,6 +1528,7 @@ def mount_activate(
path=path,
cluster=cluster,
osd_id=osd_id,
+ mount_options=mount_options,
)
return (cluster, osd_id)