Convert ohai_plugin to an LWRP

diff --git a/cookbooks/chef/.foodcritic b/cookbooks/chef/.foodcritic
index e9a7c92333039bf61f4f9c6ba263b883432b67ef..3907cff00016cb7234f45853f10398815db197e8 100644 (file)
--- a/cookbooks/chef/.foodcritic
+++ b/cookbooks/chef/.foodcritic
@@ -1,2 +1 @@
 ~FC001
 ~FC001

-~FC015

diff --git a/cookbooks/chef/definitions/ohai_plugin.rb b/cookbooks/chef/definitions/ohai_plugin.rb
deleted file mode 100644 (file)
index be7c18e..0000000
--- a/cookbooks/chef/definitions/ohai_plugin.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Cookbook Name:: chef
-# Definition:: ohai_plugin
-#
-# Copyright 2012, OpenStreetMap Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-define :ohai_plugin, :action => [:create, :delete] do
-  plugin_name = params[:name]
-  plugin_action = params[:action]
-
-  if plugin_action.include?(:create)
-    ohai plugin_name do
-      action :nothing
-    end
-
-    template "/etc/chef/ohai/#{plugin_name}.rb" do
-      source params[:template]
-      owner "root"
-      group "root"
-      mode 0644
-      notifies :reload, "ohai[#{plugin_name}]"
-    end
-  elsif plugin_action.include?(:delete)
-    template "/etc/chef/ohai/#{plugin_name}.rb" do
-      action :delete
-    end
-  end
-end

diff --git a/cookbooks/chef/metadata.rb b/cookbooks/chef/metadata.rb
index 4baffbf3c9470258f0dfa13c36ef57d021c874d7..83bb6013cd2ac7971675fd01437f217c7324d773 100644 (file)
--- a/cookbooks/chef/metadata.rb
+++ b/cookbooks/chef/metadata.rb
@@ -8,3 +8,4 @@ version           "1.0.0"
 depends           "apache"
 depends           "apt"
 depends           "git"
 depends           "apache"
 depends           "apt"
 depends           "git"

+depends           "ohai"

diff --git a/cookbooks/chef/recipes/default.rb b/cookbooks/chef/recipes/default.rb
index b8e81a3ed35dacf8ca1c9696524042d9fd56e784..a5c1042151cdd203265862412b528419df043945 100644 (file)
--- a/cookbooks/chef/recipes/default.rb
+++ b/cookbooks/chef/recipes/default.rb
@@ -109,7 +109,7 @@ template "/etc/chef/trusted_certs/verisign.pem" do
   mode 0644
 end
 
   mode 0644
 end
 

-directory "/etc/chef/ohai" do
+directory node[:ohai][:plugin_dir] do

   owner "root"
   group "root"
   mode 0755
   owner "root"
   group "root"
   mode 0755

diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb
index 6c9113968a2867e3a73ef11d616db08874711936..c276ed6c071fa1c33b61b13538a1de900ab96735 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -40,4 +40,4 @@ report_handlers << email_handler
 
 # Make our plugins visible to ohai
 
 
 # Make our plugins visible to ohai
 

-Ohai::Config[:plugin_path] << "/etc/chef/ohai"
+Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"

diff --git a/cookbooks/ohai/README.md b/cookbooks/ohai/README.md
new file mode 100644 (file)
index 0000000..2057391
--- /dev/null
+++ b/cookbooks/ohai/README.md
@@ -0,0 +1,34 @@
+Cookbook
+========
+TODO: Enter the cookbook description here.
+
+e.g.
+This cookbook makes your favorite breakfast sandwich.
+
+Requirements
+------------
+TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+
+Attributes
+----------
+TODO: List you cookbook attributes here.
+
+Usage
+-----
+TODO: Write usage instructions for each cookbook.
+
+Contributing
+------------
+TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
+
+e.g.
+1. Fork the repository on Github
+2. Create a named feature branch (like `add_component_x`)
+3. Write your change
+4. Write tests for your change (if applicable)
+5. Run the tests, ensuring they all pass
+6. Submit a Pull Request using Github
+
+License and Authors
+-------------------
+Authors: TODO: List authors

diff --git a/cookbooks/ohai/attributes/default.rb b/cookbooks/ohai/attributes/default.rb
new file mode 100644 (file)
index 0000000..8512212
--- /dev/null
+++ b/cookbooks/ohai/attributes/default.rb
@@ -0,0 +1,2 @@
+# Plugin directory
+default[:ohai][:plugin_dir] = "/etc/chef/ohai"

diff --git a/cookbooks/ohai/metadata.rb b/cookbooks/ohai/metadata.rb
new file mode 100644 (file)
index 0000000..9706391
--- /dev/null
+++ b/cookbooks/ohai/metadata.rb
@@ -0,0 +1,7 @@
+name              "ohai"
+maintainer        "OpenStreetMap Administrators"
+maintainer_email  "admins@openstreetmap.org"
+license           "Apache 2.0"
+description       "Configures ohai"
+long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
+version           "1.0.0"

diff --git a/cookbooks/ohai/providers/plugin.rb b/cookbooks/ohai/providers/plugin.rb
new file mode 100644 (file)
index 0000000..14d1070
--- /dev/null
+++ b/cookbooks/ohai/providers/plugin.rb
@@ -0,0 +1,48 @@
+#
+# Cookbook Name:: ohai
+# Provider:: ohai_plugin
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+def whyrun_supported?
+  true
+end
+
+use_inline_resources
+
+action :create do
+  ohai new_resource.name do
+    action :nothing
+  end
+
+  template plugin_path do
+    source new_resource.template
+    owner "root"
+    group "root"
+    mode 0644
+    notifies :reload, "ohai[#{new_resource.name}]"
+  end
+end
+
+action :delete do
+  template plugin_path do
+    action :delete
+  end
+end
+
+def plugin_path
+  "/etc/chef/ohai/#{new_resource.name}.rb"
+end

diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
new file mode 100644 (file)
index 0000000..4dcfaf6
--- /dev/null
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -0,0 +1,24 @@
+#
+# Cookbook Name:: ohai
+# Resource:: ohai_plugin
+#
+# 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# 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

diff --git a/cookbooks/postgresql/metadata.rb b/cookbooks/postgresql/metadata.rb
index feea0132c2cefa550b236cabc2ddc4b14447c6eb..87074a93becf1598c91e7dd05c004f0c60a827fb 100644 (file)
--- a/cookbooks/postgresql/metadata.rb
+++ b/cookbooks/postgresql/metadata.rb
@@ -5,7 +5,7 @@ license           "Apache 2.0"
 description       "Installs and configures postgresql"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version           "1.0.0"
 description       "Installs and configures postgresql"
 long_description  IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version           "1.0.0"

-depends           "chef"
+depends           "ohai"

 
 attribute "postgresql",
   :display_name => "PostgreSQL",
 
 attribute "postgresql",
   :display_name => "PostgreSQL",