Fix some chef deprecation warnings

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 096c6dfdeef82d8b459d318476a1391801e35a33..f601031abe4a6f0bd07a57dcfa90528836dd70de 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -17,7 +17,9 @@
 # limitations under the License.
 #
 
-chef_gem "pony"
+chef_gem "pony" do
+  compile_time false
+end
 
 chef_package = "chef_#{node[:chef][:client][:version]}_amd64.deb"
 

diff --git a/cookbooks/chef/recipes/gems.rb b/cookbooks/chef/recipes/gems.rb
index ddbd394c1d3dedc9f66b7a3e674479a15a1ddda6..7766bfb9c8d3a26a4d9f06655f15836dc7da22cf 100644 (file)
--- a/cookbooks/chef/recipes/gems.rb
+++ b/cookbooks/chef/recipes/gems.rb
@@ -18,6 +18,9 @@
 #
 
 node[:chef][:gems].each do |gem|
-  chef_gem gem
+  chef_gem gem do
+    compile_time false
+  end
+
   require gem
 end

diff --git a/cookbooks/munin/resources/plugin_conf.rb b/cookbooks/munin/resources/plugin_conf.rb
index e47b1336ba5ed4e075bbebc35ad8dc5d018fc491..ce4c80739ad5779ec550baa78bfaa722391808b2 100644 (file)
--- a/cookbooks/munin/resources/plugin_conf.rb
+++ b/cookbooks/munin/resources/plugin_conf.rb
@@ -21,7 +21,7 @@ actions :create, :delete
 default_action :create
 
 attribute :name, :kind_of => String, :name_attribute => true
-attribute :cookbook, :kind_of => String
+attribute :cookbook, :kind_of => [String, nil]
 attribute :template, :kind_of => String, :required => true
 attribute :variables, :kind_of => Hash, :default => {}
 attribute :restart_munin, :kind_of => [TrueClass, FalseClass], :default => true