You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/10/23 13:23:30 UTC
[2/2] git commit: AMBARI-7917. Nagios standalone installation fails
(aonishuk)
AMBARI-7917. Nagios standalone installation fails (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a2fa37e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a2fa37e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a2fa37e
Branch: refs/heads/branch-1.7.0
Commit: 1a2fa37e9c16f25cd5a8efea13b2f4a5cb0324c1
Parents: 60bba55
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Thu Oct 23 14:23:21 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Thu Oct 23 14:23:21 2014 +0300
----------------------------------------------------------------------
.../2.0.6/services/NAGIOS/package/scripts/params.py | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1a2fa37e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
index 5a0ffbb..ba91cfb 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py
@@ -104,16 +104,13 @@ if 'namenode_host' in config['clusterHostInfo']:
else:
ishdfs_value = None
-# HDFS, YARN, and MR use different settings to enable SSL
-hdfs_ssl_enabled = False
-yarn_ssl_enabled = False
-mapreduce_ssl_enabled = False
-
-# initialize all http policies to HTTP_ONLY
-dfs_http_policy = HADOOP_HTTP_POLICY
-yarn_http_policy = HADOOP_HTTP_POLICY
-mapreduce_http_policy = HADOOP_HTTP_POLICY
+dfs_http_policy = default('/configurations/hdfs-site/dfs.http.policy', HADOOP_HTTP_POLICY)
+yarn_http_policy = default('configurations/yarn-site/yarn.http.policy', HADOOP_HTTP_POLICY)
+mapreduce_http_policy = default('configurations/mapred-site/mapreduce.jobhistory.http.policy', HADOOP_HTTP_POLICY)
+hdfs_ssl_enabled = (dfs_http_policy == HADOOP_HTTPS_POLICY)
+yarn_ssl_enabled = (yarn_http_policy == HADOOP_HTTPS_POLICY)
+mapreduce_ssl_enabled = (mapreduce_http_policy == HADOOP_HTTPS_POLICY)
#
if has_namenode:
if 'dfs.http.policy' in config['configurations']['hdfs-site']: