Update the mediawiki cookbook and upstream cookbooks
Compatibility with Chef 14
This commit is contained in:
@@ -1,3 +1,7 @@
|
||||
|
||||
chef_version_for_provides '< 14.0' if respond_to?(:chef_version_for_provides)
|
||||
resource_name :ohai_hint
|
||||
|
||||
property :hint_name, String, name_property: true
|
||||
property :content, Hash
|
||||
property :compile_time, [true, false], default: true
|
||||
@@ -8,14 +12,14 @@ action :create do
|
||||
recursive true
|
||||
end
|
||||
|
||||
file ohai_hint_path do
|
||||
file ohai_hint_file_path(new_resource.hint_name) do
|
||||
action :create
|
||||
content build_content
|
||||
content format_content(new_resource.content)
|
||||
end
|
||||
end
|
||||
|
||||
action :delete do
|
||||
file ohai_hint_path do
|
||||
file ohai_hint_file_path(new_resource.hint_name) do # ~FC009
|
||||
action :delete
|
||||
notifies :reload, ohai[reload ohai post hint removal]
|
||||
end
|
||||
@@ -25,25 +29,8 @@ action :delete do
|
||||
end
|
||||
end
|
||||
|
||||
action_class.class_eval do
|
||||
def ohai_hint_path
|
||||
path = ::File.join(::Ohai::Config.ohai.hints_path.first, new_resource.hint_name)
|
||||
path << '.json' unless path.end_with?('.json')
|
||||
path
|
||||
end
|
||||
|
||||
def build_content
|
||||
# passing nil to file produces deprecation warnings so pass an empty string
|
||||
return nil if new_resource.content.nil? || new_resource.content.empty?
|
||||
JSON.pretty_generate(new_resource.content)
|
||||
end
|
||||
|
||||
def file_content(path)
|
||||
return JSON.parse(::File.read(path))
|
||||
rescue JSON::ParserError
|
||||
Chef::Log.debug("Could not parse JSON in ohai hint at #{ohai_hint_path}. It's probably an empty hint file")
|
||||
return nil
|
||||
end
|
||||
action_class do
|
||||
include OhaiCookbook::HintHelpers
|
||||
end
|
||||
|
||||
# this resource forces itself to run at compile_time
|
||||
|
||||
Reference in New Issue
Block a user