diff options
| author | Salim Afiune <afiune@chef.io> | 2016-11-03 18:01:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 18:01:56 -0400 |
| commit | 9441dcaa99160bfcd7d8ea3eda7b10597fd70163 (patch) | |
| tree | 5c5136a79b7a4f365e7246a8df9315724f8d465b /lib | |
| parent | 4c4b645a233204aa16bbe2177280ec769d20e81d (diff) | |
| parent | 49cc8b15d99216c5fb55b690e8cd22d22e5f359f (diff) | |
| download | chef-9441dcaa99160bfcd7d8ea3eda7b10597fd70163.tar.gz | |
Merge pull request #5511 from chef/allow-tokenless-chef-solo-data-collector
Enable data collector w/o token for solo, but require explicit URL
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/data_collector.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb index cf860d81e2..b92e9c122f 100644 --- a/lib/chef/data_collector.rb +++ b/lib/chef/data_collector.rb @@ -55,8 +55,7 @@ class Chef return false end if solo? && !token_auth_configured? - Chef::Log.debug("Data collector token must be configured in solo mode, disabling data collector") - return false + Chef::Log.debug("Data collector token must be configured to use Chef Automate data collector with Chef Solo") end if !solo? && token_auth_configured? Chef::Log.warn("Data collector token authentication is not recommended for client-server mode" \ |