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 5D0DC200D1F for ; Fri, 13 Oct 2017 18:38:08 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5B85C1609E9; Fri, 13 Oct 2017 16:38:08 +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 A8E141609CA for ; Fri, 13 Oct 2017 18:38:07 +0200 (CEST) Received: (qmail 25830 invoked by uid 500); 13 Oct 2017 16:38:06 -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 25821 invoked by uid 99); 13 Oct 2017 16:38:06 -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, 13 Oct 2017 16:38:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9B667DFAE0; Fri, 13 Oct 2017 16:38:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: nishant@apache.org To: commits@ambari.apache.org Message-Id: <2541110c78284665a21cac63c78ae399@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51) Date: Fri, 13 Oct 2017 16:38:06 +0000 (UTC) archived-at: Fri, 13 Oct 2017 16:38:08 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.6 de2145908 -> c65c0c3ec AMBARI-22235. Druid service check failed during EU. (b-slim via nishantmonu51) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c65c0c3e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c65c0c3e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c65c0c3e Branch: refs/heads/branch-2.6 Commit: c65c0c3ec45afb3e4d05bbc2950b2062b5a5e7ab Parents: de21459 Author: Nishant Authored: Fri Oct 13 22:07:47 2017 +0530 Committer: Nishant Committed: Fri Oct 13 22:07:47 2017 +0530 ---------------------------------------------------------------------- .../stacks/HDP/2.6/services/DRUID/kerberos.json | 45 ++++---------------- .../HDP/2.6/services/SUPERSET/kerberos.json | 10 +---- 2 files changed, 11 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c65c0c3e/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json index 198c351..f186e31 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/DRUID/kerberos.json @@ -16,7 +16,7 @@ { "name": "druid", "principal": { - "value": "${druid-env/druid_user}@${realm}", + "value": "${druid-env/druid_user}${principal_suffix}@${realm}", "type": "user", "configuration": "druid-common/druid.hadoop.security.kerberos.principal", "local_username": "${druid-env/druid_user}" @@ -41,49 +41,22 @@ ], "components": [ { - "name": "DRUID_HISTORICAL", - "identities": [ - { - "name": "druid_druid_historical_druid", - "reference": "/druid" - } - ] + "name": "DRUID_HISTORICAL" }, { - "name": "DRUID_BROKER", - "identities": [ - { - "name": "druid_druid_broker_druid", - "reference": "/druid" - } - ] + "name": "DRUID_BROKER" }, { - "name": "DRUID_OVERLORD", - "identities": [ - { - "name": "druid_druid_historical_druid", - "reference": "/druid" - } - ] + "name": "DRUID_OVERLORD" }, { - "name": "DRUID_COORDINATOR", - "identities": [ - { - "name": "druid_druid_coordinator_druid", - "reference": "/druid" - } - ] + "name": "DRUID_COORDINATOR" }, { - "name": "DRUID_MIDDLEMANAGER", - "identities": [ - { - "name": "druid_druid_middlemanager_druid", - "reference": "/druid" - } - ] + "name": "DRUID_MIDDLEMANAGER" + }, + { + "name": "DRUID_ROUTER" } ], "configurations": [ http://git-wip-us.apache.org/repos/asf/ambari/blob/c65c0c3e/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json index 5d5125d..0de6737 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SUPERSET/kerberos.json @@ -6,7 +6,7 @@ { "name": "superset", "principal": { - "value": "${superset-env/superset_user}@${realm}", + "value": "${superset-env/superset_user}${principal_suffix}@${realm}", "type": "user", "configuration": "superset/KERBEROS_PRINCIPAL", "local_username": "${superset-env/superset_user}" @@ -31,13 +31,7 @@ ], "components": [ { - "name": "SUPERSET", - "identities": [ - { - "name": "superset_superset_superset", - "reference": "/superset" - } - ] + "name": "SUPERSET" } ], "configurations": [