Make munin use the node name instead of the FQDN

[chef.git] / cookbooks / chef / attributes / default.rb

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index e2a0f18bfd982fb4394476087d90028c29bc6a41..2cac140f19e7489c274d0c24ca2b21de79b6ecd9 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -1,11 +1,8 @@
 # Add the opscode APT source for chef
 # Add the opscode APT source for chef

-default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ]
+default[:apt][:sources] = node[:apt][:sources] | ["opscode"]

 
 # Set the default server version
 
 # Set the default server version

-default[:chef][:server][:version] = "11.1.3-1"
+default[:chef][:server][:version] = "12.17.33"

 
 # Set the default client version
 
 # Set the default client version

-default[:chef][:client][:version] = "11.12.8-2"
-
-# A list of gems needed by chef recipes
-default[:chef][:gems] = []
+default[:chef][:client][:version] = "14.12.9"