Repository: ambari Updated Branches: refs/heads/branch-2.5 32ee5995b -> a262118ff refs/heads/trunk 192162e05 -> 49f6b8005
AMBARI-21236. Principal placeholder replacement in kerberos.json does not work with blueprint installs (Attila Magyar via adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a262118f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a262118f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a262118f Branch: refs/heads/branch-2.5 Commit: a262118ff29be8e4c4a77351822d8bf245d9bb0f Parents: 32ee599 Author: Attila Magyar <[email protected]> Authored: Thu Jun 15 11:34:12 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Thu Jun 15 11:34:12 2017 +0200 ---------------------------------------------------------------------- .../apache/ambari/server/controller/KerberosHelperImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a262118f/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java ---------------------------------------------------------------------- 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 802c93d..e4b70fd 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 @@ -1278,11 +1278,9 @@ public class KerberosHelperImpl implements KerberosHelper { Map<String, String> kerberosDescriptorProperties) throws AmbariException { - Map<String, Map<String, String>> configuration = addAdditionalConfigurations(cluster, + return addAdditionalConfigurations(cluster, calculateExistingConfigurations(cluster, hostname), hostname, kerberosDescriptorProperties); - configuration.put("principals", principalNames(cluster, configuration)); - return configuration; } private Map<String, String> principalNames(Cluster cluster, Map<String, Map<String, String>> configuration) throws AmbariException { @@ -2576,7 +2574,7 @@ public class KerberosHelperImpl implements KerberosHelper { configurations.put("clusterHostInfo", componentHosts); } } - + configurations.put("principals", principalNames(cluster, configurations)); return configurations; }
