summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Guy <fawkes@mit.edu>2015-11-11 21:35:31 -0500
committerDonald Guy <fawkes@mit.edu>2015-11-11 21:35:31 -0500
commit9e28233f448278e1d28025433ee65fbfe9f2ba82 (patch)
treebfd278195c4b44bf202acc03486e44b2ce451dd7
parentb0dbe243d469cc36477ba8102b74a8456b6f276d (diff)
downloadchef-9e28233f448278e1d28025433ee65fbfe9f2ba82.tar.gz
Allow named_run_list to be loaded from config
nil default in application/client.rb shadowed any value from config when executing chef-client (but not chef-shell -z) default in config is set to nil at https://github.com/chef/chef/blob/b0dbe243d469cc36477ba8102b74a8456b6f276d/chef-config/lib/chef-config/config.rb#L363, so otherwise this change is a no-op
-rw-r--r--lib/chef/application/client.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index 5fac34196d..8cc045cb8e 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -169,8 +169,7 @@ class Chef::Application::Client < Chef::Application
option :named_run_list,
:short => "-n NAMED_RUN_LIST",
:long => "--named-run-list NAMED_RUN_LIST",
- :description => "Use a policyfile's named run list instead of the default run list",
- :default => nil
+ :description => "Use a policyfile's named run list instead of the default run list"
option :environment,
:short => '-E ENVIRONMENT',