Use declare_resource to avoid need for template_source wart

[chef.git] / cookbooks / ohai / resources / plugin.rb

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 4dcfaf68de2f0cef9cf17df1dafeb93f8b5d0ebd..aef9886287ce95f3f30096ac30651456a2312d89 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -17,8 +17,33 @@
 # limitations under the License.
 #
 
-actions :create, :delete
 default_action :create
 
-attribute :name, :kind_of => String, :name_attribute => true
-attribute :template, :kind_of => String, :required => true
+property :plugin, :kind_of => String, :name_attribute => true
+property :template, :kind_of => String, :required => true
+
+action :create do
+  ohai new_resource.plugin do
+    action :nothing
+  end
+
+  declare_resource :template, plugin_path do
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode 0o644
+    notifies :reload, "ohai[#{new_resource.plugin}]"
+  end
+end
+
+action :delete do
+  file plugin_path do
+    action :delete
+  end
+end
+
+action_class do
+  def plugin_path
+    "/etc/chef/ohai/#{new_resource.plugin}.rb"
+  end
+end