summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-12-13 10:12:19 -0800
committerGitHub <noreply@github.com>2018-12-13 10:12:19 -0800
commit5a404937b468ecd16e208650c5a561bdcb5fb2eb (patch)
tree4c495c2cfc9ebafd03071c5df5db04ec9e43f7ed
parentf840677605ccdf9e15e742163028b069eeb8b6e8 (diff)
parentfbd9fafa2436fab673078c957cd912eae4185763 (diff)
downloadchef-5a404937b468ecd16e208650c5a561bdcb5fb2eb.tar.gz
Merge pull request #7980 from chef/init_package_plugin
minimal_ohai: Add init_package plugin as a required plugin
-rw-r--r--lib/chef/client.rb2
-rw-r--r--spec/unit/client_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 770cdea32c..e668aeee00 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -604,7 +604,7 @@ class Chef
# @api private
#
def run_ohai
- filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version} : nil
+ filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
ohai.all_plugins(filter)
events.ohai_completed(node)
rescue Ohai::Exceptions::CriticalPluginFailure => e
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 4f9d66d776..acb5fb7997 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -38,7 +38,7 @@ describe Chef::Client do
end
it "runs ohai with only the minimum required plugins" do
- expected_filter = %w{fqdn machinename hostname platform platform_version ohai_time os os_version}
+ expected_filter = %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package}
expect(ohai_system).to receive(:all_plugins).with(expected_filter)
client.run_ohai
end