Adds _netdev for fuse mounts in fstab

diff --git a/providers/cephfs.rb b/providers/cephfs.rb
index 73961834d993efa7a8e9957a455141970db451ba..a781f5b4340fefe1189731d701d05ea66cb6d9c7 100644 (file)
--- a/providers/cephfs.rb
+++ b/providers/cephfs.rb
@@ -25,7 +25,7 @@ def manage_mount(directory, subdir, use_fuse, action)
       fstype 'fuse.ceph'
       # needs two slashes to indicate a network mount to chef
       device "conf=//etc/ceph/ceph.conf,id=#{client_name},keyfile=#{filename}"
-      options 'defaults'
+      options 'defaults,_netdev'
       dump 0
       pass 0
       action action

diff --git a/test/cookbooks/ceph_test/recipes/cephfs.rb b/test/cookbooks/ceph_test/recipes/cephfs.rb
index 3ad328bf74e31fc931dec4570a069647a028acc9..c4589a80f005364ad21d06c696d0ffe372356468 100644 (file)
--- a/test/cookbooks/ceph_test/recipes/cephfs.rb
+++ b/test/cookbooks/ceph_test/recipes/cephfs.rb
@@ -39,6 +39,10 @@ ceph_cephfs '/ceph.fuse' do
   use_fuse true
   action [:mount]
 end
+ceph_cephfs '/ceph.fstab' do
+  use_fuse true
+  action [:mount, :enable]
+end
 directory '/ceph/subdir'
 file '/ceph/subdir/file' do
   content "It works\n"

diff --git a/test/integration/aio/bats/cephfs.bats b/test/integration/aio/bats/cephfs.bats
index 8dd3cbe584c5553265a1a68256479603aed1a345..b5d2a99878b5462c82926c32173c91d84164383d 100644 (file)
--- a/test/integration/aio/bats/cephfs.bats
+++ b/test/integration/aio/bats/cephfs.bats
@@ -8,13 +8,19 @@
 @test "/ceph.fuse is mounted" {
   grep -q -E '^\S+\s+/ceph\.fuse\s+fuse' /proc/mounts
 }
+@test "/ceph.fstab is mounted" {
+  grep -q -E '^\S+\s+/ceph\.fstab\s+fuse' /proc/mounts
+}
 
 @test "/ceph is in fstab" {
-  grep -q -E '^\S+\s+/ceph\s+' /etc/fstab
+  grep -q -E '^\S+\s+/ceph\s+\S+\s+\S*_netdev\S*\s' /etc/fstab
 }
 @test "/ceph.fuse is NOT in fstab" {
   grep -v -q -E '^\S+\s+/ceph.fuse\s+' /etc/fstab
 }
+@test "/ceph.fstab is in fstab" {
+  grep -q -E '^\S+\s+/ceph.fstab\s+\S+\s+\S*_netdev\S*\s' /etc/fstab
+}
 
 @test "test file exists in /ceph" {
   test -e /ceph/subdir/file