From acabd71e5ccd75d9b019c8a8ab821129c02bb002 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 23 Oct 2015 09:06:32 +0100
Subject: [PATCH] Fix some chef deprecation warnings

---
 cookbooks/chef/recipes/default.rb        | 4 +++-
 cookbooks/chef/recipes/gems.rb           | 5 ++++-
 cookbooks/munin/resources/plugin_conf.rb | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index 096c6dfde..f601031ab 100644
--- 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 ddbd394c1..7766bfb9c 100644
--- 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 e47b1336b..ce4c80739 100644
--- 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
-- 
2.43.2