summaryrefslogtreecommitdiff
path: root/lib/chef/application
diff options
context:
space:
mode:
authordanielsdeleo <dan@getchef.com>2015-03-27 13:12:28 -0700
committerdanielsdeleo <dan@getchef.com>2015-03-27 14:54:25 -0700
commit4827c9d31e68eafdff8d865d40479a18e6382793 (patch)
treeb1d632eed5b1c784eae9ac763eea5c6886f47acf /lib/chef/application
parent0a089f77adcf988fb43858ae0c446c31ab4727e5 (diff)
downloadchef-4827c9d31e68eafdff8d865d40479a18e6382793.tar.gz
Add minimal ohai mode option flagminimal-ohai-mode
Diffstat (limited to 'lib/chef/application')
-rw-r--r--lib/chef/application/apply.rb5
-rw-r--r--lib/chef/application/client.rb5
-rw-r--r--lib/chef/application/solo.rb5
3 files changed, 15 insertions, 0 deletions
diff --git a/lib/chef/application/apply.rb b/lib/chef/application/apply.rb
index 42805001d8..e9768b218c 100644
--- a/lib/chef/application/apply.rb
+++ b/lib/chef/application/apply.rb
@@ -85,6 +85,11 @@ class Chef::Application::Apply < Chef::Application
:default => !Chef::Platform.windows?,
:description => "Use colored output, defaults to enabled"
+ option :minimal_ohai,
+ :long => "--minimal-ohai",
+ :description => "Only run the bare minimum ohai plugins chef needs to function",
+ :boolean => true
+
attr_reader :json_attribs
def initialize
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 03fd07e9f0..9984ad5b9d 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -253,6 +253,11 @@ class Chef::Application::Client < Chef::Application
:description => "Enable audit-mode with `enabled`. Disable audit-mode with `disabled`. Skip converge and only perform audits with `audit-only`",
:proc => lambda { |mo| mo.gsub("-", "_").to_sym }
+ option :minimal_ohai,
+ :long => "--minimal-ohai",
+ :description => "Only run the bare minimum ohai plugins chef needs to function",
+ :boolean => true
+
IMMEDIATE_RUN_SIGNAL = "1".freeze
attr_reader :chef_client_json
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 97a1952d0f..dd09d65b42 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -180,6 +180,11 @@ class Chef::Application::Solo < Chef::Application
:description => "Set maximum duration to wait for another client run to finish, default is indefinitely.",
:proc => lambda { |s| s.to_i }
+ option :minimal_ohai,
+ :long => "--minimal-ohai",
+ :description => "Only run the bare minimum ohai plugins chef needs to function",
+ :boolean => true
+
attr_reader :chef_client_json
def initialize