diff options
| author | Tim Smith <tsmith@chef.io> | 2018-12-19 20:08:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-19 20:08:37 -0800 |
| commit | c86b900bcdc524ba204887509f91153a6634f779 (patch) | |
| tree | 93ca1c7e8394ac93594c35ddb00daadabf486599 | |
| parent | e2f8515f9600875be24e7ff6f7add5a353a60894 (diff) | |
| parent | 0d5a782322b4e510ac161c67fe85d16cc90ba575 (diff) | |
| download | chef-c86b900bcdc524ba204887509f91153a6634f779.tar.gz | |
Merge pull request #8072 from chef/minimal_ohai
chef 14: minimal_ohai: Add init_package plugin as a required plugin
| -rw-r--r-- | lib/chef/client.rb | 2 | ||||
| -rw-r--r-- | spec/unit/client_spec.rb | 2 |
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 |