You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/01/29 19:01:56 UTC
ambari git commit: AMBARI-9404 : Unit test failures in trunk (jluniya)
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 <jl...@hortonworks.com>
Authored: Thu Jan 29 10:01:47 2015 -0800
Committer: Jayush Luniya <jl...@hortonworks.com>
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'