Merge remote-tracking branch 'github/pull/713'

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

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index ee8f159cc990d578ac4ec995e526ecfc05756899..72719e2ec21214016a8d1bff8f8b15290ebc4027 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: ohai
+# Cookbook:: ohai

 # Resource:: ohai_plugin
 #
 # Resource:: ohai_plugin
 #

-# Copyright 2015, OpenStreetMap Foundation
+# Copyright:: 2015, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,21 +17,30 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+unified_mode true
+

 default_action :create
 
 default_action :create
 

-property :plugin, :kind_of => String, :name_attribute => true
-property :template, :kind_of => String, :required => true
+property :plugin, :kind_of => String, :name_property => true
+property :template, :kind_of => String, :required => [:create]

 
 action :create do
   ohai new_resource.plugin do
     action :nothing
   end
 
 
 action :create do
   ohai new_resource.plugin do
     action :nothing
   end
 

+  directory "/etc/chef/ohai/plugins" do
+    owner "root"
+    group "root"
+    mode "755"
+    recursive true
+  end
+

   declare_resource :template, plugin_path do
     source new_resource.template
     owner "root"
     group "root"
   declare_resource :template, plugin_path do
     source new_resource.template
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     notifies :reload, "ohai[#{new_resource.plugin}]"
   end
 end
     notifies :reload, "ohai[#{new_resource.plugin}]"
   end
 end


@@ -44,6 +53,6 @@ end
 
 action_class do
   def plugin_path
 
 action_class do
   def plugin_path

-    "/etc/chef/ohai/#{new_resource.plugin}.rb"
+    "/etc/chef/ohai/plugins/#{new_resource.plugin}.rb"

   end
 end
   end
 end