You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2017/06/15 09:38:43 UTC
[2/2] ambari git commit: AMBARI-21236. Principal placeholder
replacement in kerberos.json does not work with blueprint installs (Attila
Magyar via adoroszlai)
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/49f6b800
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49f6b800
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49f6b800
Branch: refs/heads/trunk
Commit: 49f6b80051ac3b2cf7e4b18b0b2c454f2f9a6da9
Parents: 192162e
Author: Attila Magyar <am...@hortonworks.com>
Authored: Thu Jun 15 11:35:03 2017 +0200
Committer: Attila Doroszlai <ad...@hortonworks.com>
Committed: Thu Jun 15 11:35:03 2017 +0200
----------------------------------------------------------------------
.../apache/ambari/server/controller/KerberosHelperImpl.java | 6 ++----
.../apache/ambari/server/controller/KerberosHelperTest.java | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/49f6b800/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 61674cf..d57fcd2 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
@@ -1243,11 +1243,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 {
@@ -2543,7 +2541,7 @@ public class KerberosHelperImpl implements KerberosHelper {
configurations.put("clusterHostInfo", componentHosts);
}
}
-
+ configurations.put("principals", principalNames(cluster, configurations));
return configurations;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/49f6b800/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 18a6754..4508527 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@ -2388,7 +2388,7 @@ public class KerberosHelperTest extends EasyMockSupport {
servicesMap.put("SERVICE2", service2);
Cluster cluster = createMockCluster(clusterName, Arrays.asList(host1, host2, host3), SecurityType.KERBEROS, configKrb5Conf, configKerberosEnv);
- expect(cluster.getServices()).andReturn(servicesMap).times(2);
+ expect(cluster.getServices()).andReturn(servicesMap).anyTimes();
Map<String, String> kerberosDescriptorProperties = new HashMap<>();
kerberosDescriptorProperties.put("additional_realms", "");
@@ -2595,7 +2595,7 @@ public class KerberosHelperTest extends EasyMockSupport {
servicesMap.put("SERVICE1", service1);
Cluster cluster = createMockCluster("c1", Arrays.asList(host1), SecurityType.KERBEROS, configKrb5Conf, configKerberosEnv);
- expect(cluster.getServices()).andReturn(servicesMap).times(2);
+ expect(cluster.getServices()).andReturn(servicesMap).anyTimes();
Map<String, String> kerberosDescriptorProperties = new HashMap<>();
kerberosDescriptorProperties.put("additional_realms", "");
@@ -2610,7 +2610,7 @@ public class KerberosHelperTest extends EasyMockSupport {
KerberosDescriptor kerberosDescriptor = createMock(KerberosDescriptor.class);
expect(kerberosDescriptor.getProperties()).andReturn(kerberosDescriptorProperties);
- expect(kerberosDescriptor.getService("SERVICE1")).andReturn(service1KerberosDescriptor).times(1);
+ expect(kerberosDescriptor.getService("SERVICE1")).andReturn(service1KerberosDescriptor).anyTimes();
setupKerberosDescriptor(kerberosDescriptor);