Repository: ambari Updated Branches: refs/heads/trunk 733f2478a -> 5bdd6cf7e
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/5bdd6cf7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5bdd6cf7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5bdd6cf7 Branch: refs/heads/trunk Commit: 5bdd6cf7e24469da3d5bec987939b35fff263983 Parents: 733f247 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Mon Jan 16 17:11:54 2017 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Mon Jan 16 17:20:18 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/5bdd6cf7/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 ab5e026..37babff 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 @@ -76,7 +76,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'
