Repository: ambari Updated Branches: refs/heads/branch-2.5 31a146077 -> 0d5576f2d
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/0d5576f2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d5576f2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d5576f2 Branch: refs/heads/branch-2.5 Commit: 0d5576f2d2f52be1b502b3c356849437eff4a121 Parents: 31a1460 Author: Siddharth Wagle <[email protected]> Authored: Mon Jan 16 17:00:00 2017 -0800 Committer: Siddharth Wagle <[email protected]> Committed: Mon Jan 16 17:00:00 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/0d5576f2/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 dbb0010..a138f03 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,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']
