You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2015/01/27 00:47:56 UTC
ambari git commit: AMBARI-9323. Kerberos: host/@REALM
principals are created (should not be created) (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 5cef47f44 -> 862a176d4
AMBARI-9323. Kerberos: host/<hostname>@REALM principals are created (should not be created) (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/862a176d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/862a176d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/862a176d
Branch: refs/heads/trunk
Commit: 862a176d4a9fb0ee2b9a9076a281a86e9099d2b7
Parents: 5cef47f
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Jan 26 18:47:37 2015 -0500
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Jan 26 18:47:37 2015 -0500
----------------------------------------------------------------------
.../stacks/HDP/2.2/services/HDFS/kerberos.json | 54 ---------------
.../stacks/HDP/2.2/services/YARN/kerberos.json | 72 --------------------
.../server/stack/KerberosDescriptorTest.java | 19 ++++++
.../HDP/2.0.8/services/HDFS/kerberos.json | 54 ---------------
4 files changed, 19 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/862a176d/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/kerberos.json
index 8b7979e..af8f93b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/kerberos.json
@@ -55,24 +55,6 @@
}
},
{
- "name": "namenode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/nn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "hdfs-site/dfs.namenode.kerberos.internal.spnego.principal"
@@ -110,24 +92,6 @@
},
"configuration": "hdfs-site/dfs.datanode.keytab.file"
}
- },
- {
- "name": "datanode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/dn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
}
],
"configurations" : [
@@ -164,24 +128,6 @@
}
},
{
- "name": "secondary_namenode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/nn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "hdfs-site/dfs.secondary.namenode.kerberos.internal.spnego.principal"
http://git-wip-us.apache.org/repos/asf/ambari/blob/862a176d/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index 596d607..42d0c1e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -48,24 +48,6 @@
}
},
{
- "name": "nodemanager_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/nm.service.keytab",
- "owner": {
- "name": "${yarn-env/yarn_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "yarn-site/yarn.nodemanager.webapp.spnego-principal"
@@ -108,24 +90,6 @@
}
},
{
- "name": "resource_manager_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/rm.service.keytab",
- "owner": {
- "name": "${yarn-env/yarn_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "yarn-site/yarn.resourcemanager.webapp.spnego-principal"
@@ -161,24 +125,6 @@
}
},
{
- "name": "app_timeline_server_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/yarn.service.keytab",
- "owner": {
- "name": "${yarn-env/yarn_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
@@ -230,24 +176,6 @@
}
},
{
- "name": "history_server_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/jhs.service.keytab",
- "owner": {
- "name": "${mapred-env/mapred_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
http://git-wip-us.apache.org/repos/asf/ambari/blob/862a176d/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
index 0abb2f3..cf426b0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/stack/KerberosDescriptorTest.java
@@ -74,4 +74,23 @@ public class KerberosDescriptorTest {
Assert.notNull(descriptor.getServices());
Assert.notNull(descriptor.getService("HBASE"));
}
+
+ @Test
+ public void testHDP22HDFSServiceDescriptor() throws IOException {
+ File hdfsDirectory = new File(hdp22ServicesDirectory, "HDFS");
+ KerberosDescriptor descriptor = KerberosDescriptor.fromFile(new File(hdfsDirectory, "kerberos.json"));
+ Assert.notNull(descriptor);
+ Assert.notNull(descriptor.getServices());
+ Assert.notNull(descriptor.getService("HDFS"));
+ }
+
+ @Test
+ public void testHDP22YarnServiceDescriptor() throws IOException {
+ File yarnDirectory = new File(hdp22ServicesDirectory, "YARN");
+ KerberosDescriptor descriptor = KerberosDescriptor.fromFile(new File(yarnDirectory, "kerberos.json"));
+ Assert.notNull(descriptor);
+ Assert.notNull(descriptor.getServices());
+ Assert.notNull(descriptor.getService("YARN"));
+ Assert.notNull(descriptor.getService("MAPREDUCE2"));
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/862a176d/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json
index 99a4227..2f2b861 100644
--- a/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json
+++ b/ambari-server/src/test/resources/stacks/HDP/2.0.8/services/HDFS/kerberos.json
@@ -28,24 +28,6 @@
}
},
{
- "name": "namenode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/nn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "hdfs-site/dfs.namenode.kerberos.internal.spnego.principal"
@@ -83,24 +65,6 @@
},
"configuration": "hdfs-site/dfs.datanode.keytab.file"
}
- },
- {
- "name": "datanode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/dn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
}
]
},
@@ -129,24 +93,6 @@
}
},
{
- "name": "secondary_namenode_host",
- "principal": {
- "value": "host/_HOST@${realm}",
- "type" : "service"
- },
- "keytab": {
- "file": "${keytab_dir}/snn.service.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- }
- }
- },
- {
"name": "/spnego",
"principal": {
"configuration": "hdfs-site/dfs.secondary.namenode.kerberos.internal.spnego.principal"