You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by st...@apache.org on 2016/11/18 11:03:40 UTC
ambari git commit: AMBARI-18923. Keytab settings in kerberos.json for
SPARK are at the wrong place. (Attila Magyar via stoader)
Repository: ambari
Updated Branches:
refs/heads/trunk eb1411d22 -> e96c68fcb
AMBARI-18923. Keytab settings in kerberos.json for SPARK are at the wrong place. (Attila Magyar via stoader)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e96c68fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e96c68fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e96c68fc
Branch: refs/heads/trunk
Commit: e96c68fcb9804bec46380bca84c2f69b5aa3808a
Parents: eb1411d
Author: Attila Magyar <am...@hortonworks.com>
Authored: Fri Nov 18 12:03:07 2016 +0100
Committer: Toader, Sebastian <st...@hortonworks.com>
Committed: Fri Nov 18 12:03:23 2016 +0100
----------------------------------------------------------------------
.../stacks/HDP/2.5/services/SPARK/kerberos.json | 60 +++++++++----------
.../stacks/HDP/2.6/services/SPARK/kerberos.json | 62 ++++++++++----------
2 files changed, 61 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e96c68fc/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json
index 934f3c6..bd6c6c1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json
@@ -26,36 +26,6 @@
},
"configuration": "spark-defaults/spark.history.kerberos.keytab"
}
- },
- {
- "name": "livyuser",
- "principal": {
- "value": "${livy-env/livy_user}/_HOST@${realm}",
- "type" : "service",
- "configuration": "livy-conf/livy.server.kerberos.principal",
- "local_username": "${livy-env/livy_user}"
- },
- "keytab": {
- "file": "${keytab_dir}/livy.service.keytab",
- "owner": {
- "name": "${livy-env/livy_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- },
- "configuration": "livy-conf/livy.server.kerberos.keytab"
- }
- },
- {
- "name": "/spnego",
- "principal": {
- "configuration": "livy-conf/livy.server.auth.kerberos.principal"
- },
- "keytab": {
- "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
- }
}
],
"configurations": [
@@ -112,6 +82,36 @@
"identities": [
{
"name": "/HDFS/NAMENODE/hdfs"
+ },
+ {
+ "name": "livyuser",
+ "principal": {
+ "value": "${livy-env/livy_user}/_HOST@${realm}",
+ "type" : "service",
+ "configuration": "livy-conf/livy.server.kerberos.principal",
+ "local_username": "${livy-env/livy_user}"
+ },
+ "keytab": {
+ "file": "${keytab_dir}/livy.service.keytab",
+ "owner": {
+ "name": "${livy-env/livy_user}",
+ "access": "r"
+ },
+ "group": {
+ "name": "${cluster-env/user_group}",
+ "access": ""
+ },
+ "configuration": "livy-conf/livy.server.kerberos.keytab"
+ }
+ },
+ {
+ "name": "/spnego",
+ "principal": {
+ "configuration": "livy-conf/livy.server.auth.kerberos.principal"
+ },
+ "keytab": {
+ "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
+ }
}
]
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e96c68fc/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json
index 0689e7f..ae0d631 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/kerberos.json
@@ -26,37 +26,6 @@
},
"configuration": "spark-defaults/spark.history.kerberos.keytab"
}
- },
- {
- "name": "livyuser",
- "principal": {
- "value": "${livy-env/livy_user}/_HOST@${realm}",
- "type" : "service",
- "configuration": "livy-conf/livy.server.launch.kerberos.principal",
- "local_username": "${livy-env/livy_user}"
- },
- "keytab": {
- "file": "${keytab_dir}/livy.service.keytab",
- "owner": {
- "name": "${livy-env/livy_user}",
- "access": "r"
- },
- "group": {
- "name": "${cluster-env/user_group}",
- "access": ""
- },
- "configuration": "livy-conf/livy.server.launch.kerberos.keytab"
- }
- },
- {
- "name": "livy_spnego",
- "reference": "/spnego",
- "principal": {
- "configuration": "livy-conf/livy.server.auth.kerberos.principal"
- },
- "keytab": {
- "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
- }
}
],
"configurations": [
@@ -117,6 +86,37 @@
{
"name": "hdfs",
"reference": "/HDFS/NAMENODE/hdfs"
+ },
+ {
+ "name": "livyuser",
+ "principal": {
+ "value": "${livy-env/livy_user}/_HOST@${realm}",
+ "type" : "service",
+ "configuration": "livy-conf/livy.server.launch.kerberos.principal",
+ "local_username": "${livy-env/livy_user}"
+ },
+ "keytab": {
+ "file": "${keytab_dir}/livy.service.keytab",
+ "owner": {
+ "name": "${livy-env/livy_user}",
+ "access": "r"
+ },
+ "group": {
+ "name": "${cluster-env/user_group}",
+ "access": ""
+ },
+ "configuration": "livy-conf/livy.server.launch.kerberos.keytab"
+ }
+ },
+ {
+ "name": "livy_spnego",
+ "reference": "/spnego",
+ "principal": {
+ "configuration": "livy-conf/livy.server.auth.kerberos.principal"
+ },
+ "keytab": {
+ "configuration": "livy-conf/livy.server.auth.kerberos.keytab"
+ }
}
]
}