You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by lp...@apache.org on 2017/09/14 14:38:48 UTC
[12/38] ambari git commit: AMBARI-21893 : NameNode Heap Usage (Daily)
metric alert status flips to UNKNOWN intermittently when AMS HTTPS is
enabled. (Addendum patch) (avijayan)
AMBARI-21893 : NameNode Heap Usage (Daily) metric alert status flips to UNKNOWN intermittently when AMS HTTPS is enabled. (Addendum patch) (avijayan)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4f6ef91f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4f6ef91f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4f6ef91f
Branch: refs/heads/feature-branch-AMBARI-21307
Commit: 4f6ef91f33cefeea97629dd4dc45ec993b27b4f6
Parents: a49121b
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Tue Sep 12 19:54:01 2017 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Tue Sep 12 19:54:01 2017 -0700
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4f6ef91f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
index 51e0756..c72e2f0 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py
@@ -515,12 +515,11 @@ def export_ca_certs(dir_path):
truststore_p12 = os.path.join(tmpdir,'truststore.p12')
if (params.metric_truststore_type.lower() == 'jks'):
- if not params.metric_truststore_alias:
- for alias in params.metric_truststore_alias_list:
- # Convert truststore from JKS to PKCS12
- cmd = format("{sudo} {java64_home}/bin/keytool -importkeystore -srckeystore {metric_truststore_path} -destkeystore {truststore_p12} -srcalias " + alias + " -deststoretype PKCS12 -srcstorepass {metric_truststore_password} -deststorepass {metric_truststore_password}")
- Execute(cmd,
- )
+ for alias in params.metric_truststore_alias_list:
+ # Convert truststore from JKS to PKCS12
+ cmd = format("{sudo} {java64_home}/bin/keytool -importkeystore -srckeystore {metric_truststore_path} -destkeystore {truststore_p12} -srcalias " + alias + " -deststoretype PKCS12 -srcstorepass {metric_truststore_password} -deststorepass {metric_truststore_password}")
+ Execute(cmd,
+ )
truststore = truststore_p12
# Export all CA certificates from the truststore to the conf directory