diff options
Diffstat (limited to 'lib/chef/train_transport.rb')
| -rw-r--r-- | lib/chef/train_transport.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/train_transport.rb b/lib/chef/train_transport.rb index a4f311fc51..ba935f637f 100644 --- a/lib/chef/train_transport.rb +++ b/lib/chef/train_transport.rb @@ -17,7 +17,7 @@ require "chef-config/mixin/credentials" autoload :Train, "train" -require_relative "dist" +require "chef-utils" class Chef class TrainTransport @@ -77,8 +77,8 @@ class Chef credentials_file = if tm_config.credentials_file && File.exist?(tm_config.credentials_file) tm_config.credentials_file - elsif File.exist?(Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials")) - Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/#{profile}/credentials") + elsif File.exist?("#{ChefConfig::Config.etc_chef_dir}/#{profile}/credentials") + "#{ChefConfig::Config.etc_chef_dir}/#{profile}/credentials" else super end @@ -102,7 +102,7 @@ class Chef tm_config = Chef::Config.target_mode protocol = tm_config.protocol train_config = tm_config.to_hash.select { |k| Train.options(protocol).key?(k) } - Chef::Log.trace("Using target mode options from #{Chef::Dist::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config + Chef::Log.trace("Using target mode options from #{ChefUtils::Dist::Infra::PRODUCT} config file: #{train_config.keys.join(", ")}") if train_config # Load the credentials file, and place any valid settings into the train configuration credentials = load_credentials(tm_config.host) |