diff options
| author | Thom May <thom@chef.io> | 2016-05-10 17:09:57 +0100 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2016-05-16 13:38:12 +0100 |
| commit | 09ae18ee32b61e1b3c607dcc84c9d59d2c300428 (patch) | |
| tree | 0add1084ac4642c5119dff102000075bf6d58321 /lib/chef/shell | |
| parent | 9bd561b2fafe03444d690bef0b882a446b327cd6 (diff) | |
| download | chef-09ae18ee32b61e1b3c607dcc84c9d59d2c300428.tar.gz | |
Ensure that solo specific code is run at the proper time
ie, only when we're in OG mode and not in local mode.
Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'lib/chef/shell')
| -rw-r--r-- | lib/chef/shell/shell_session.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/chef/shell/shell_session.rb b/lib/chef/shell/shell_session.rb index 6d8b6f14ae..0a8cba5be3 100644 --- a/lib/chef/shell/shell_session.rb +++ b/lib/chef/shell/shell_session.rb @@ -150,7 +150,7 @@ module Shell private def rebuild_node - Chef::Config[:solo] = true + Chef::Config[:solo_legacy_mode] = true @client = Chef::Client.new(nil, Chef::Config[:shell_config]) @client.run_ohai @client.load_node @@ -182,7 +182,7 @@ module Shell def rebuild_node # Tell the client we're chef solo so it won't try to contact the server - Chef::Config[:solo] = true + Chef::Config[:solo_legacy_mode] = true @client = Chef::Client.new(nil, Chef::Config[:shell_config]) @client.run_ohai @client.load_node @@ -213,7 +213,7 @@ module Shell def rebuild_node # Make sure the client knows this is not chef solo - Chef::Config[:solo] = false + Chef::Config[:solo_legacy_mode] = false @client = Chef::Client.new(nil, Chef::Config[:shell_config]) @client.run_ohai @client.register |