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 A24FB200D42 for ; Fri, 17 Nov 2017 21:40:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id A0C2E160BFB; Fri, 17 Nov 2017 20:40:27 +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 E8FF9160BE6 for ; Fri, 17 Nov 2017 21:40:26 +0100 (CET) Received: (qmail 71200 invoked by uid 500); 17 Nov 2017 20:40:26 -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 71191 invoked by uid 99); 17 Nov 2017 20:40:26 -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, 17 Nov 2017 20:40:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4B547DFD8C; Fri, 17 Nov 2017 20:40:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mradhakrishnan@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-22468 : enabling hdfs and hive ranger plugin fails (mradhakrishnan) Date: Fri, 17 Nov 2017 20:40:24 +0000 (UTC) archived-at: Fri, 17 Nov 2017 20:40:27 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.6 c09c69b2f -> a1d59b7dd AMBARI-22468 : enabling hdfs and hive ranger plugin fails (mradhakrishnan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a1d59b7d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a1d59b7d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a1d59b7d Branch: refs/heads/branch-2.6 Commit: a1d59b7dde13b8e3cad5a1e1687911ca4afc340b Parents: c09c69b Author: Madhuvanthi Radhakrishnan Authored: Fri Nov 17 12:39:07 2017 -0800 Committer: Madhuvanthi Radhakrishnan Committed: Fri Nov 17 12:40:21 2017 -0800 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.6/services/stack_advisor.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a1d59b7d/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py index a16fdb7..a5f54a3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.6/services/stack_advisor.py @@ -66,11 +66,12 @@ class HDP26StackAdvisor(HDP25StackAdvisor): if storm_env and storm_site and security_enabled and 'STREAMLINE' in servicesList: storm_nimbus_impersonation_acl = storm_site["nimbus.impersonation.acl"] if "nimbus.impersonation.acl" in storm_site else None streamline_env = self.getServicesSiteProperties(services, "streamline-env") - _streamline_principal_name = streamline_env['streamline_principal_name'] if 'streamline_principal_name' in streamline_env else None - if _streamline_principal_name is not None and storm_nimbus_impersonation_acl is not None: - streamline_bare_principal = get_bare_principal(_streamline_principal_name) - storm_nimbus_impersonation_acl.replace('{{streamline_bare_principal}}', streamline_bare_principal) - putStormSiteProperty('nimbus.impersonation.acl', storm_nimbus_impersonation_acl) + if streamline_env: + _streamline_principal_name = streamline_env['streamline_principal_name'] if 'streamline_principal_name' in streamline_env else None + if _streamline_principal_name is not None and storm_nimbus_impersonation_acl is not None: + streamline_bare_principal = get_bare_principal(_streamline_principal_name) + storm_nimbus_impersonation_acl.replace('{{streamline_bare_principal}}', streamline_bare_principal) + putStormSiteProperty('nimbus.impersonation.acl', storm_nimbus_impersonation_acl) storm_nimbus_autocred_plugin_classes = storm_site["nimbus.autocredential.plugins.classes"] if "nimbus.autocredential.plugins.classes" in storm_site else None if storm_nimbus_autocred_plugin_classes is not None: