Merge pull request #1174 from chef/ssd/default-to-backcompat

Set insecure_addon_compat to true by default
chef · Mar 24, 2017 · 4f1fef6 · 4f1fef6
2 parents 135d192 + ec85963
commit 4f1fef6
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/omnibus/files/private-chef-cookbooks/private-chef/libraries/private_chef.rb b/omnibus/files/private-chef-cookbooks/private-chef/libraries/private_chef.rb
@@ -107,7 +107,7 @@ module PrivateChef
 
   registered_extensions Mash.new
 
-  insecure_addon_compat false
+  insecure_addon_compat true
 
   class << self
     def from_file(filename)
@@ -571,7 +571,8 @@ def warn_if_cred_mismatch(opts)
     #
     def save_credentials_to_config
       credentials.legacy_credentials_hash.each do |service, creds|
-        next if service == "chef-server"
+        # Ignore secrets added by add-ons and the keys
+        next if PrivateChef[service].nil?
         creds.each do |name, value|
           PrivateChef[service][name] ||= value
         end