diff options
Diffstat (limited to 'chef-config/lib/chef-config/workstation_config_loader.rb')
| -rw-r--r-- | chef-config/lib/chef-config/workstation_config_loader.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb index 65940102fc..af0c438ca1 100644 --- a/chef-config/lib/chef-config/workstation_config_loader.rb +++ b/chef-config/lib/chef-config/workstation_config_loader.rb @@ -225,12 +225,14 @@ module ChefConfig Config[:node_name] ||= Etc.getlogin # If we don't have a key (path or inline) check user.pem and $node_name.pem. unless Config.key?(:client_key) || Config.key?(:client_key_contents) - Config[:client_key] = find_default_key(["#{Config[:node_name]}.pem", "user.pem"]) + key_path = find_default_key(["#{Config[:node_name]}.pem", "user.pem"]) + Config[:client_key] = key_path if key_path end # Similarly look for a validation key file, though this should be less # common these days. unless Config.key?(:validation_key) || Config.key?(:validation_key_contents) - Config[:validation_key] = find_default_key(["#{Config[:validation_client_name]}.pem", "validator.pem", "validation.pem"]) + key_path = find_default_key(["#{Config[:validation_client_name]}.pem", "validator.pem", "validation.pem"]) + Config[:validation_key] = key_path if key_path end end |