diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-03 10:12:06 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-05-03 10:13:22 -0700 |
| commit | a1ead9b142b74e579bd64efba9989b69afbfe61a (patch) | |
| tree | cd74040416a1c2000dff709e3118facd9315f836 /lib/chef/data_collector.rb | |
| parent | 50e700570b11558c57a1559e5af35b5e636ecfe2 (diff) | |
| download | chef-a1ead9b142b74e579bd64efba9989b69afbfe61a.tar.gz | |
Update more brand names to current
Update Chef Client and Chef Server brand names to current.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib/chef/data_collector.rb')
| -rw-r--r-- | lib/chef/data_collector.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/data_collector.rb b/lib/chef/data_collector.rb index 1294231e24..66853c58fb 100644 --- a/lib/chef/data_collector.rb +++ b/lib/chef/data_collector.rb @@ -26,6 +26,7 @@ require "chef/data_collector/run_end_message" require "chef/data_collector/run_start_message" require "chef/data_collector/config_validation" require "chef/data_collector/error_handlers" +require "chef/dist" class Chef class DataCollector @@ -303,7 +304,7 @@ class Chef return false when running_mode == :client && Chef::Config[:data_collector][:token] Chef::Log.warn("Data collector token authentication is not recommended for client-server mode. " \ - "Please upgrade Chef Server to 12.11.0 and remove the token from your config file " \ + "Please upgrade #{Chef::Dist::SERVER_PRODUCT} to 12.11 or later and remove the token from your config file " \ "to use key based authentication instead") return true when Chef::Config[:data_collector][:output_locations] && Chef::Config[:data_collector][:output_locations][:files] && !Chef::Config[:data_collector][:output_locations][:files].empty? @@ -311,7 +312,7 @@ class Chef return true when running_mode == :solo && !Chef::Config[:data_collector][:token] # we are in solo mode and are not logging to a file, so must have a token - Chef::Log.trace("Data collector token must be configured to use Chef Automate data collector with Chef Solo") + Chef::Log.trace("Data collector token must be configured to use Chef Automate data collector with #{Chef::Dist::PRODUCT} Solo") return false else return true |