Use chef 14 to run tests

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

diff --git a/cookbooks/nfs/recipes/default.rb b/cookbooks/nfs/recipes/default.rb
index f4c6016bbd7604b3a7b853bd56cb74cbab6efe44..c42cf9c82eb9b398254a5c0fb33e61e4fe98568d 100644 (file)
--- a/cookbooks/nfs/recipes/default.rb
+++ b/cookbooks/nfs/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: nfs
+# Cookbook:: nfs

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2010, OpenStreetMap Foundation
+# Copyright:: 2010, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -21,17 +21,17 @@ package "nfs-common"
 
 node[:nfs].each do |mountpoint, details|
   mount_options = if details[:readonly]
 
 node[:nfs].each do |mountpoint, details|
   mount_options = if details[:readonly]

-                    "ro,bg,soft,udp,rsize=8192,wsize=8192,nfsvers=3"
+                    "ro,bg,soft,tcp,rsize=8192,wsize=8192,nfsvers=4"

                   else
                   else

-                    "rw,bg,udp,rsize=8192,wsize=8192,nfsvers=3"
+                    "rw,bg,tcp,rsize=8192,wsize=8192,nfsvers=4"

                   end
 
   directory mountpoint do
     owner "root"
     group "root"
                   end
 
   directory mountpoint do
     owner "root"
     group "root"

-    mode 0755
+    mode 0o755

     recursive true
     recursive true

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

   end
 
   mount mountpoint do
   end
 
   mount mountpoint do