Repository: ambari Updated Branches: refs/heads/branch-2.5 ef869d324 -> 08d011191
AMBARI-19390. AMS Collector works in HTTP mode after setting ams-site/timeline.metrics.service.http.policy=HTTPS_ONLY. Addendum UT fix. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/08d01119 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/08d01119 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/08d01119 Branch: refs/heads/branch-2.5 Commit: 08d011191d654ca43b4987f52476535af921398d Parents: ef869d3 Author: Siddharth Wagle <[email protected]> Authored: Mon Jan 16 17:21:15 2017 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Mon Jan 16 17:21:15 2017 -0800 ---------------------------------------------------------------------- .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/08d01119/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index a138f03..0ab6f3a 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -71,7 +71,7 @@ else: metric_truststore_path= default("/configurations/ams-ssl-client/ssl.client.truststore.location", "") metric_truststore_type= default("/configurations/ams-ssl-client/ssl.client.truststore.type", "") metric_truststore_password= default("/configurations/ams-ssl-client/ssl.client.truststore.password", "") -metric_truststore_alias = config['configurations']['ams-ssl-client']['ssl.client.truststore.alias'] +metric_truststore_alias = default("/configurations/ams-ssl-client/ssl.client.truststore.alias", None) if not metric_truststore_alias: metric_truststore_alias = config["hostname"] metric_truststore_ca_certs='ca.pem'
