Repository: ambari Updated Branches: refs/heads/trunk 07430c4c4 -> 61aa4c52d
AMBARI-19390. AMS Collector works in HTTP mode after setting ams-site/timeline.metrics.service.http.policy=HTTPS_ONLY. Addendum. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61aa4c52 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61aa4c52 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61aa4c52 Branch: refs/heads/trunk Commit: 61aa4c52ddf45e5c0a3f731d3676e462260ffc7a Parents: 07430c4 Author: Siddharth Wagle <[email protected]> Authored: Mon Jan 16 17:01:14 2017 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Mon Jan 16 17:01:14 2017 -0800 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/params.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/61aa4c52/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 433870f..ab5e026 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,9 @@ 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 = default("/configurations/ams-ssl-client/ssl.client.truststore.alias", config["hostname"]) +metric_truststore_alias = config['configurations']['ams-ssl-client']['ssl.client.truststore.alias'] +if not metric_truststore_alias: + metric_truststore_alias = config["hostname"] metric_truststore_ca_certs='ca.pem' agent_cache_dir = config['hostLevelParams']['agentCacheDir']
