Fix detection of NVME disks

[chef.git] / cookbooks / nfs / recipes / default.rb

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index 0b4c9ffe4ca05530599d48379f779ad66990e646..f4c6016bbd7604b3a7b853bd56cb74cbab6efe44 100644 (file)
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -19,23 +19,23 @@
 
 package "nfs-common"
 
 
 package "nfs-common"
 

-node[:nfs].each do |mountpoint,details|
-  if details[:readonly]
-    mount_options = "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3"
-  else
-    mount_options = "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3"
-  end
+node[:nfs].each do |mountpoint, details|
+  mount_options = if details[:readonly]
+                    "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3"
+                  else
+                    "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3"
+                  end

 
   directory mountpoint do
     owner "root"
     group "root"
     mode 0755
     recursive true
 
   directory mountpoint do
     owner "root"
     group "root"
     mode 0755
     recursive true

-    not_if { File.exists?(mountpoint) }
+    not_if { File.exist?(mountpoint) }

   end
 
   mount mountpoint do
   end
 
   mount mountpoint do

-    action [ :mount, :enable ]
+    action [:mount, :enable]

     device "#{details[:host]}:#{details[:path]}"
     fstype "nfs"
     options mount_options
     device "#{details[:host]}:#{details[:path]}"
     fstype "nfs"
     options mount_options