[ambari] branch trunk updated: [AMBARI-24375] Adding services when Kerberos is enabled incorrectly changes unrelated service configurations

[rlevas]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 853a9e2  [AMBARI-24375] Adding services when Kerberos is enabled 
incorrectly changes unrelated service configurations
853a9e2 is described below

commit 853a9e2c5365912acc55cd05f1ee903255523346
Author: Robert Levas <rle...@hortonworks.com>
AuthorDate: Sun Aug 5 12:52:33 2018 -0400

    [AMBARI-24375] Adding services when Kerberos is enabled incorrectly changes 
unrelated service configurations
---
 .../ambari/server/controller/KerberosHelperImpl.java  | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index e835380..bff5640 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -752,25 +752,6 @@ public class KerberosHelperImpl implements KerberosHelper {
           continue;
         }
 
-        for (Map.Entry<String, Map<String, Map<String, String>>> config : 
requestConfigurations.entrySet()) {
-          for (Map<String, String> properties : config.getValue().values()) {
-            for (Map.Entry<String, String> property : properties.entrySet()) {
-              String oldValue = property.getValue();
-              String updatedValue = 
variableReplacementHelper.replaceVariables(property.getValue(), 
existingConfigurations);
-              if (!StringUtils.equals(oldValue, updatedValue) && 
!config.getKey().isEmpty()) {
-                property.setValue(updatedValue);
-                if (kerberosConfigurations.containsKey(config.getKey())) {
-                  
kerberosConfigurations.get(config.getKey()).put(property.getKey(), 
updatedValue);
-                } else {
-                  Map kerberosConfigProperties = new HashMap<>();
-                  kerberosConfigProperties.put(property.getKey(), 
updatedValue);
-                  kerberosConfigurations.put(config.getKey(), 
kerberosConfigProperties);
-                }
-              }
-            }
-          }
-        }
-
         StackAdvisorRequest request = 
StackAdvisorRequest.StackAdvisorRequestBuilder
           .forStack(stackId.getStackName(), stackId.getStackVersion())
           .forServices(services)