summaryrefslogtreecommitdiff
path: root/lib/chef/shell.rb
diff options
context:
space:
mode:
authorSalim Afiune <afiune@chef.io>2017-03-14 16:49:43 -0400
committerTom Duffield <tom@chef.io>2017-03-17 11:46:12 -0500
commitdad266026cea748013b9b593dc88cbe523a9a623 (patch)
tree38a27039a9d1b64483f0457a0261d267d5115b47 /lib/chef/shell.rb
parent44363a16a0e876b0466fb3d6f4927a39db39fc10 (diff)
downloadchef-dad266026cea748013b9b593dc88cbe523a9a623.tar.gz
Deprecate SoloSession into SoloLegacySession
Signed-off-by: Salim Afiune <afiune@chef.io>
Diffstat (limited to 'lib/chef/shell.rb')
-rw-r--r--lib/chef/shell.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/chef/shell.rb b/lib/chef/shell.rb
index e8c3704553..d7aff8fce6 100644
--- a/lib/chef/shell.rb
+++ b/lib/chef/shell.rb
@@ -239,6 +239,12 @@ FOOTER
:description => "chef-client session",
:boolean => true
+ option :solo_legacy_mode,
+ :long => "--solo-legacy-mode",
+ :description => "chef-solo legacy session",
+ :boolean => true,
+ :proc => proc { Chef::Config[:solo_legacy_mode] = true }
+
option :json_attribs,
:short => "-j JSON_ATTRIBS",
:long => "--json-attributes JSON_ATTRIBS",
@@ -313,7 +319,7 @@ FOOTER
config_file_to_try
elsif dot_chef_dir && ::File.exist?(File.join(dot_chef_dir, "chef_shell.rb"))
File.join(dot_chef_dir, "chef_shell.rb")
- elsif config[:solo]
+ elsif config[:solo_legacy_mode]
Chef::Config.platform_specific_path("/etc/chef/solo.rb")
elsif config[:client]
Chef::Config.platform_specific_path("/etc/chef/client.rb")