You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2015/05/28 19:38:50 UTC
ambari git commit: AMBARI-11488. Need to pass JAVA_HOME to credential
helper script for KMS (Goutam Borad via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 2cb335c47 -> 3cfc2be31
AMBARI-11488. Need to pass JAVA_HOME to credential helper script for KMS (Goutam Borad via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3cfc2be3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cfc2be3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cfc2be3
Branch: refs/heads/trunk
Commit: 3cfc2be315644e342b301d6144ada4ab012bc55c
Parents: 2cb335c
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu May 28 10:38:42 2015 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu May 28 10:38:42 2015 -0700
----------------------------------------------------------------------
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3cfc2be3/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index 6fc8c99..9028800 100755
--- a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++ b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -101,7 +101,7 @@ def do_keystore_setup(cred_provider_path, credential_alias, credential_password)
if cred_provider_path is not None:
cred_setup = format('{cred_setup_prefix} -f {cred_provider_path} -k "{credential_alias}" -v "{credential_password}" -c 1')
- Execute(cred_setup, logoutput=True)
+ Execute(cred_setup, environment={'JAVA_HOME': params.java_home}, logoutput=True)
File(cred_provider_path,
owner = params.kms_user,
@@ -268,13 +268,13 @@ def enable_kms_plugin():
if params.xa_audit_db_is_enabled:
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k "auditDBCred" -v "{xa_audit_db_password}" -c 1')
- Execute(cred_setup, logoutput=True)
+ Execute(cred_setup, environment={'JAVA_HOME': params.java_home}, logoutput=True)
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k "sslKeyStore" -v "{ssl_keystore_password}" -c 1')
- Execute(cred_setup, logoutput=True)
+ Execute(cred_setup, environment={'JAVA_HOME': params.java_home}, logoutput=True)
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k "sslTrustStore" -v "{ssl_truststore_password}" -c 1')
- Execute(cred_setup, logoutput=True)
+ Execute(cred_setup, environment={'JAVA_HOME': params.java_home}, logoutput=True)
File(params.credential_file,
owner = params.kms_user,