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/06/27 00:10:34 UTC
ambari git commit: AMBARI-12156. Kerberos: prompts for HDFS ambari
principals w/o hdfs in cluster (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 4a0c4098c -> e4012e958
AMBARI-12156. Kerberos: prompts for HDFS ambari principals w/o hdfs in cluster (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4012e95
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4012e95
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4012e95
Branch: refs/heads/trunk
Commit: e4012e95857c87b526ec2d7f6f9ebec0b6e58b35
Parents: 4a0c409
Author: Robert Levas <rl...@hortonworks.com>
Authored: Fri Jun 26 18:10:24 2015 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Fri Jun 26 18:10:30 2015 -0400
----------------------------------------------------------------------
.../ACCUMULO/1.6.1.2.2.0/kerberos.json | 2 +-
.../AMBARI_METRICS/0.1.0/kerberos.json | 2 +-
.../FALCON/0.5.0.2.1/kerberos.json | 2 +-
.../HBASE/0.96.0.2.0/kerberos.json | 2 +-
.../HDFS/2.1.0.2.0/kerberos.json | 20 ++++++++++-
.../OOZIE/4.0.0.2.0/kerberos.json | 2 +-
.../OOZIE/4.2.0.2.3/kerberos.json | 2 +-
.../SPARK/1.2.0.2.2/kerberos.json | 2 +-
.../YARN/2.1.0.2.0/kerberos.json | 4 +--
.../resources/stacks/HDP/2.0.6/kerberos.json | 21 ------------
.../stacks/HDP/2.2/services/YARN/kerberos.json | 4 +--
.../services/ACCUMULO/kerberos.json | 2 +-
.../HDP/2.3/services/ACCUMULO/kerberos.json | 2 +-
.../stacks/HDP/2.3/services/YARN/kerberos.json | 4 +--
.../HDP/2.0.8/services/HDFS/kerberos.json | 35 ++++++++++++++++++++
15 files changed, 69 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
index 48a1280..9101005 100644
--- a/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/ACCUMULO/1.6.1.2.2.0/kerberos.json
@@ -47,7 +47,7 @@
}
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
index 33443e6..6010b2f 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/kerberos.json
@@ -7,7 +7,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
}
],
"components": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json
index ac5f49e..8d5923a 100644
--- a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/kerberos.json
@@ -10,7 +10,7 @@
"name": "/smokeuser"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
}
],
"configurations": [
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
index e743428..1de417f 100644
--- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json
@@ -7,7 +7,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "hbase",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
index 7534bf9..b9e6a75 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/kerberos.json
@@ -16,7 +16,25 @@
"name": "/smokeuser"
},
{
- "name": "/hdfs"
+ "name": "hdfs",
+ "principal": {
+ "value": "${hadoop-env/hdfs_user}-${cluster_name}@${realm}",
+ "type" : "user" ,
+ "configuration": "hadoop-env/hdfs_principal_name",
+ "local_username" : "${hadoop-env/hdfs_user}"
+ },
+ "keytab": {
+ "file": "${keytab_dir}/hdfs.headless.keytab",
+ "owner": {
+ "name": "${hadoop-env/hdfs_user}",
+ "access": "r"
+ },
+ "group": {
+ "name": "${cluster-env/user_group}",
+ "access": "r"
+ },
+ "configuration": "hadoop-env/hdfs_user_keytab"
+ }
}
],
"auth_to_local_properties" : [
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
index 8998b98..9560990 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/kerberos.json
@@ -10,7 +10,7 @@
"name": "/smokeuser"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
}
],
"auth_to_local_properties" : [
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
index 5d17a8f..d61d5ab 100644
--- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/kerberos.json
@@ -10,7 +10,7 @@
"name": "/smokeuser"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
}
],
"auth_to_local_properties" : [
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
index fb8b04a..60c9bfa 100644
--- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/kerberos.json
@@ -7,7 +7,7 @@
"name": "/smokeuser"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "sparkuser",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index 1332ae9..15ad5af 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -7,7 +7,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
@@ -166,7 +166,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
index 015da1f..03198dc 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/kerberos.json
@@ -23,27 +23,6 @@
}
},
{
- "name": "hdfs",
- "principal": {
- "value": "${hadoop-env/hdfs_user}-${cluster_name}@${realm}",
- "type" : "user" ,
- "configuration": "hadoop-env/hdfs_principal_name",
- "local_username" : "${hadoop-env/hdfs_user}"
- },
- "keytab": {
- "file": "${keytab_dir}/hdfs.headless.keytab",
- "owner": {
- "name": "${hadoop-env/hdfs_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": "r"
- },
- "configuration": "hadoop-env/hdfs_user_keytab"
- }
- },
- {
"name": "smokeuser",
"principal": {
"value": "${cluster-env/smokeuser}-${cluster_name}@${realm}",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/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 ff8dc2c..b464120 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
@@ -7,7 +7,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
@@ -166,7 +166,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
index f1939d6..9089367 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3.GlusterFS/services/ACCUMULO/kerberos.json
@@ -67,7 +67,7 @@
}
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
index 82d8336..73aaf3d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ACCUMULO/kerberos.json
@@ -67,7 +67,7 @@
}
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
index 4926d65..c0db1c5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/kerberos.json
@@ -7,7 +7,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
@@ -175,7 +175,7 @@
"name": "/spnego"
},
{
- "name": "/hdfs"
+ "name": "/HDFS/hdfs"
},
{
"name": "/smokeuser"
http://git-wip-us.apache.org/repos/asf/ambari/blob/e4012e95/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 2f2b861..c285234 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
@@ -2,6 +2,41 @@
"services": [
{
"name": "HDFS",
+ "identities": [
+ {
+ "name": "/spnego",
+ "principal": {
+ "configuration": "hdfs-site/dfs.web.authentication.kerberos.principal"
+ },
+ "keytab": {
+ "configuration": "hdfs-site/dfs.web.authentication.kerberos.keytab"
+ }
+ },
+ {
+ "name": "/smokeuser"
+ },
+ {
+ "name": "hdfs",
+ "principal": {
+ "value": "${hadoop-env/hdfs_user}-${cluster_name}@${realm}",
+ "type" : "user" ,
+ "configuration": "hadoop-env/hdfs_principal_name",
+ "local_username" : "${hadoop-env/hdfs_user}"
+ },
+ "keytab": {
+ "file": "${keytab_dir}/hdfs.headless.keytab",
+ "owner": {
+ "name": "${hadoop-env/hdfs_user}",
+ "access": "r"
+ },
+ "group": {
+ "name": "${cluster-env/user_group}",
+ "access": "r"
+ },
+ "configuration": "hadoop-env/hdfs_user_keytab"
+ }
+ }
+ ],
"components": [
{
"name": "NAMENODE",