summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS.Cavallo <smcavallo@hotmail.com>2018-05-12 16:04:31 -0400
committerS.Cavallo <smcavallo@hotmail.com>2018-05-12 16:04:31 -0400
commitb934472d0c3b9ca777baacb5dc589373115029f5 (patch)
tree50f13eb5ca1a036b8fe4d4f515825424f6333198
parent14f0ffc9efa6a6e75ee9506d4f149126a6516706 (diff)
downloadchef-b934472d0c3b9ca777baacb5dc589373115029f5.tar.gz
use config merge
Signed-off-by: S.Cavallo <smcavallo@hotmail.com>
-rw-r--r--chef-config/lib/chef-config/workstation_config_loader.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/chef-config/lib/chef-config/workstation_config_loader.rb b/chef-config/lib/chef-config/workstation_config_loader.rb
index 84616c0e3e..1ae6b6924b 100644
--- a/chef-config/lib/chef-config/workstation_config_loader.rb
+++ b/chef-config/lib/chef-config/workstation_config_loader.rb
@@ -156,10 +156,10 @@ 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|
+ creds.each do |key, value|
next unless key == "knife"
- value.each do | k, v |
- Config.knife[k.to_sym] = v
+ value.each do |k, v|
+ Config.knife.merge!({k.to_sym => v})
end
end