diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-01-23 12:11:01 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-23 12:11:01 -0800 |
commit | 9f78fdbdbdf43659ce2c13f2838e7db2178c5726 (patch) | |
tree | f94decb6f0e62000309b4461dcf742f220731304 /lib/chef/application/solo.rb | |
parent | a7202f77460729090f95e4ff995f4ab1c0898bba (diff) | |
download | chef-9f78fdbdbdf43659ce2c13f2838e7db2178c5726.tar.gz |
Revert "Fail on interval runs on windows"
Diffstat (limited to 'lib/chef/application/solo.rb')
-rw-r--r-- | lib/chef/application/solo.rb | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index b255951e3f..6b4aef42b4 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -1,7 +1,7 @@ # # Author:: AJ Christensen (<aj@chef.io>) # Author:: Mark Mzyk (mmzyk@chef.io) -# Copyright:: Copyright 2008-2018, Chef Software Inc. +# Copyright:: Copyright 2008-2018, Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -261,13 +261,7 @@ class Chef::Application::Solo < Chef::Application Chef::Config[:interval] ||= 1800 end - if Chef::Config[:interval] - if Chef::Platform.windows? - Chef::Application.fatal!(windows_interval_error_message) - elsif !Chef::Config[:client_fork] - Chef::Application.fatal!(unforked_interval_error_message) - end - end + Chef::Application.fatal!(unforked_interval_error_message) if !Chef::Config[:client_fork] && Chef::Config[:interval] if Chef::Config[:recipe_url] cookbooks_path = Array(Chef::Config[:cookbook_path]).detect { |e| Pathname.new(e).cleanpath.to_s =~ /\/cookbooks\/*$/ } @@ -369,17 +363,10 @@ EOH end end - def windows_interval_error_message - "Windows chef-solo interval runs are disabled in Chef 14." + - "\nConfiguration settings:" + - "#{"\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]}" + - "\nPlease install chef-solo as a Windows service or scheduled task instead." - end - def unforked_interval_error_message - "Unforked chef-solo interval runs are disabled in Chef 12." + + "Unforked chef-client interval runs are disabled in Chef 12." + "\nConfiguration settings:" + "#{"\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]}" + - "\nEnable chef-solo interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." + "\nEnable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." end end |