Repository: ambari Updated Branches: refs/heads/branch-2.5 02f0e3646 -> 2027166f5
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/2027166f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2027166f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2027166f Branch: refs/heads/branch-2.5 Commit: 2027166f59cebb84a11be012218ce006162011d8 Parents: 02f0e36 Author: Attila Magyar <amag...@hortonworks.com> Authored: Fri Nov 18 12:03:07 2016 +0100 Committer: Toader, Sebastian <stoa...@hortonworks.com> Committed: Fri Nov 18 12:05:29 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/2027166f/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/2027166f/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" + } } ] }
