Update cookbooks
* Replace old nginx cookbook with new chef_nginx cookbooks * Update application cookbook
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
#
|
||||
# Cookbook Name:: ohai
|
||||
# Cookbook:: ohai
|
||||
# Recipe:: default
|
||||
#
|
||||
# Copyright 2011-2016, Chef Software, Inc
|
||||
# Copyright:: 2011-2017, Chef Software, Inc
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -17,36 +17,4 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
reload_ohai = false
|
||||
# Add plugin_path from node attributes if missing, and ensure a reload of
|
||||
# ohai in that case
|
||||
unless Ohai::Config[:plugin_path].include?(node['ohai']['plugin_path'])
|
||||
Ohai::Config[:plugin_path] = [node['ohai']['plugin_path'], Ohai::Config[:plugin_path]].flatten.compact
|
||||
reload_ohai ||= true
|
||||
end
|
||||
Chef::Log.info("ohai plugins will be at: #{node['ohai']['plugin_path']}")
|
||||
|
||||
# This is done during the compile phase so new plugins can be used in
|
||||
# resources later in the run.
|
||||
node['ohai']['plugins'].each_pair do |source_cookbook, path|
|
||||
rd = remote_directory "#{node['ohai']['plugin_path']} for cookbook #{source_cookbook}" do
|
||||
path node['ohai']['plugin_path']
|
||||
cookbook source_cookbook
|
||||
source path
|
||||
mode '0755' unless platform_family?('windows')
|
||||
recursive true
|
||||
purge false
|
||||
action :nothing
|
||||
end
|
||||
|
||||
rd.run_action(:create)
|
||||
reload_ohai ||= rd.updated?
|
||||
end
|
||||
|
||||
resource = ohai 'custom_plugins' do
|
||||
action :nothing
|
||||
end
|
||||
|
||||
# Reload ohai if the client's plugin_path did not contain
|
||||
# node['ohai']['plugin_path'], or new plugins were loaded
|
||||
resource.run_action(:reload) if reload_ohai
|
||||
Chef::Log.warn('The Ohai cookbook default recipe has no content as of the 4.0 release. See the readme for instructions on using the custom resources.')
|
||||
|
||||
Reference in New Issue
Block a user