summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS.Cavallo <smcavallo@hotmail.com>2018-05-12 16:33:14 -0400
committerS.Cavallo <smcavallo@hotmail.com>2018-05-12 16:33:14 -0400
commit32e6d65f449af38fad8712366d2400c148f0ad94 (patch)
tree21746f5e55ec309b987bc2c19aaeae3ad44e1d95
parentb934472d0c3b9ca777baacb5dc589373115029f5 (diff)
downloadchef-32e6d65f449af38fad8712366d2400c148f0ad94.tar.gz
more concise
Signed-off-by: S.Cavallo <smcavallo@hotmail.com>
-rw-r--r--chef-config/lib/chef-config/workstation_config_loader.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb
index 1ae6b6924b..b7b361316d 100644
--- a/chef-config/lib/chef-config/workstation_config_loader.rb
+++ b/chef-config/lib/chef-config/workstation_config_loader.rb
@@ -156,12 +156,7 @@ module ChefConfig
Config.chef_server_url = creds.fetch("chef_server_url") if creds.key?("chef_server_url")
Config.validation_client_name = creds.fetch("validation_client_name") if creds.key?("validation_client_name")
- creds.each do |key, value|
- next unless key == "knife"
- value.each do |k, v|
- Config.knife.merge!({k.to_sym => v})
- end
- end
+ Config.knife.merge!(Hash[creds.fetch('knife', {}).map{|k, v| [k.to_sym, v]}])
extract_key(creds, "validation_key", :validation_key, :validation_key_contents)
extract_key(creds, "validator_key", :validation_key, :validation_key_contents)