summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Magyar <amagyar@hortonworks.com>2016-11-18 12:12:03 +0100
committerToader, Sebastian <stoader@hortonworks.com>2016-11-18 12:12:03 +0100
commit3b9056bac4324ba929a72985a80b99e7e85931a6 (patch)
tree0c16c8f8b6c7cfc0e703d97c7f7c4eed4ed193c4
parent049a051f5e255c478c60d54a36102cb316f37703 (diff)
AMBARI-18923. Keytab settings in kerberos.json for SPARK are at the wrong place. (Attila Magyar via stoader)branch-2.4
-rw-r--r--ambari-server/src/main/resources/stacks/HDP/2.5/services/SPARK/kerberos.json60
1 files changed, 30 insertions, 30 deletions
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 934f3c6673..bd6c6c18f7 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"
+ }
}
]
}