Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DD01F200BC3 for ; Fri, 18 Nov 2016 12:03:41 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id DB904160B04; Fri, 18 Nov 2016 11:03:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0A4FC160AFE for ; Fri, 18 Nov 2016 12:03:40 +0100 (CET) Received: (qmail 17574 invoked by uid 500); 18 Nov 2016 11:03:40 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 17565 invoked by uid 99); 18 Nov 2016 11:03:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2016 11:03:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 285D9E00B3; Fri, 18 Nov 2016 11:03:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stoader@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18923. Keytab settings in kerberos.json for SPARK are at the wrong place. (Attila Magyar via stoader) Date: Fri, 18 Nov 2016 11:03:40 +0000 (UTC) archived-at: Fri, 18 Nov 2016 11:03:42 -0000 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 Authored: Fri Nov 18 12:03:07 2016 +0100 Committer: Toader, Sebastian 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" + } } ] }