Disable gpximport, statistics and cleanup roles on spike-04

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

diff --git a/cookbooks/nfs/recipes/server.rb b/cookbooks/nfs/recipes/server.rb
index 3e13507f19514c91040daec0bf47fbddc66c62e5..33e5a315ea3097699421ed4cdfcf912aaed80087 100644 (file)
--- a/cookbooks/nfs/recipes/server.rb
+++ b/cookbooks/nfs/recipes/server.rb
@@ -19,32 +19,33 @@
 
 package "nfs-kernel-server"
 
-service "portmap" do
-  action [ :enable, :start ]
+service "rpcbind" do
+  provider Chef::Provider::Service::Upstart
+  action [:enable, :start]
   supports :status => true, :restart => true, :reload => true
 end
 
-#service "nfs-kernel-server" do
-#  action [ :enable, :start ]
-#  supports :status => true, :restart => true, :reload => true
-#end
+# service "nfs-kernel-server" do
+#   action [ :enable, :start ]
+#   supports :status => true, :restart => true, :reload => true
+# end
 
 exports = {}
 
 search(:node, "*:*") do |client|
-  if client[:nfs]
-    client[:nfs].each_value do |mount|
-      if mount[:host] == node[:hostname]
-        client.ipaddresses do |address|
-          exports[mount[:path]] ||= {}
+  next unless client[:nfs]
 
-          if mount[:readonly]
-            exports[mount[:path]][address] = "ro"
-          else
-            exports[mount[:path]][address] = "rw"
-          end
-        end
-      end
+  client[:nfs].each_value do |mount|
+    next unless mount[:host] == node[:hostname]
+
+    client.ipaddresses do |address|
+      exports[mount[:path]] ||= {}
+
+      exports[mount[:path]][address] = if mount[:readonly]
+                                         "ro"
+                                       else
+                                         "rw"
+                                       end
     end
   end
 end
@@ -60,5 +61,5 @@ template "/etc/exports" do
   group "root"
   mode 0644
   variables :exports => exports
-  notifies :run, resources(:execute => "exportfs")
+  notifies :run, "execute[exportfs]"
 end