ohai: use standard plugin path

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

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index 5d550371faf7997fa3d8396ab03fa60cf4a2b55d..7a78a8806c28c605fb22268cb05e5f228cc619ad 100644 (file)
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
+unified_mode true
+
 default_action :create
 
 property :plugin, :kind_of => String, :name_property => true
@@ -27,13 +29,19 @@ action :create do
     action :nothing
   end
 
-  directory "/etc/chef/ohai" do
+  directory "/etc/chef/ohai/plugins" do
     owner "root"
     group "root"
     mode "755"
     recursive true
   end
 
+  # FIXME: Cleanup of plugins in the old location
+  declare_resource :file, plugin_old_path do
+    action :delete
+    notifies :reload, "ohai[#{new_resource.plugin}]"
+  end
+
   declare_resource :template, plugin_path do
     source new_resource.template
     owner "root"
@@ -50,7 +58,11 @@ action :delete do
 end
 
 action_class do
-  def plugin_path
+  def plugin_old_path
     "/etc/chef/ohai/#{new_resource.plugin}.rb"
   end
+
+  def plugin_path
+    "/etc/chef/ohai/plugins/#{new_resource.plugin}.rb"
+  end
 end