Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 26E1E178F8 for ; Thu, 29 Jan 2015 18:01:56 +0000 (UTC) Received: (qmail 9287 invoked by uid 500); 29 Jan 2015 18:01:56 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 9259 invoked by uid 500); 29 Jan 2015 18:01:56 -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 9249 invoked by uid 99); 29 Jan 2015 18:01:56 -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; Thu, 29 Jan 2015 18:01:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76A3CE055B; Thu, 29 Jan 2015 18:01:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jluniya@apache.org To: commits@ambari.apache.org Message-Id: <8609384f9e324521838fe391301aa5ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-9404 : Unit test failures in trunk (jluniya) Date: Thu, 29 Jan 2015 18:01:56 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/trunk 3d744e879 -> 899ead72d AMBARI-9404 : Unit test failures in trunk (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/899ead72 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/899ead72 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/899ead72 Branch: refs/heads/trunk Commit: 899ead72d3a567092c8d7258d7d84c9f3f47af45 Parents: 3d744e8 Author: Jayush Luniya Authored: Thu Jan 29 10:01:47 2015 -0800 Committer: Jayush Luniya Committed: Thu Jan 29 10:01:47 2015 -0800 ---------------------------------------------------------------------- .../common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/899ead72/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py index 621fd77..701bcd4 100644 --- a/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/KNOX/0.5.0.2.2/package/scripts/params_linux.py @@ -29,6 +29,8 @@ knox_master_secret_path = '/var/lib/knox/data/security/master' knox_cert_store_path = '/var/lib/knox/data/security/keystores/gateway.jks' knox_user = default("/configurations/knox-env/knox_user", "knox") +stack_version_unformatted = str(config['hostLevelParams']['stack_version']) +hdp_stack_version = format_hdp_stack_version(stack_version_unformatted) if hdp_stack_version != "" and compare_versions(hdp_stack_version, '2.2') >= 0: knox_bin = '/usr/hdp/current/knox-server/bin/gateway.sh' ldap_bin = '/usr/hdp/current/knox-server/bin/ldap.sh'