Repository: ambari Updated Branches: refs/heads/trunk 2cc94aebc -> 246136562
AMBARI-6167 Nagios won't install on 2.1.GlusterFS stack Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/24613656 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/24613656 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/24613656 Branch: refs/heads/trunk Commit: 246136562bb8cee8db6daec3723f7943769fb984 Parents: 2cc94ae Author: Erin A Boyd <eb...@redhat.com> Authored: Mon Jun 30 09:02:33 2014 -0600 Committer: Erin A Boyd <eb...@redhat.com> Committed: Mon Jun 30 09:02:47 2014 -0600 ---------------------------------------------------------------------- .../HDP/2.0.6/services/NAGIOS/package/scripts/params.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/24613656/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 8fcdd14..cb3d5c1 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 @@ -133,8 +133,11 @@ if dfs_ha_enabled: nn_host = config['configurations']['hdfs-site'][format('dfs.namenode.rpc-address.{dfs_ha_nameservices}.{nn_id}')] nn_ha_host_port_map[nn_host.split(":")[0]] = nn_host.split(":")[1] else: - namenode_metadata_port = get_port_from_url(config['configurations']['core-site']['fs.defaultFS']) - nn_ha_host_port_map[config['clusterHostInfo']['namenode_host'][0]] = namenode_metadata_port + if 'namenode_host' in config['clusterHostInfo']: + namenode_metadata_port = get_port_from_url(config['configurations']['core-site']['fs.defaultFS']) + nn_ha_host_port_map[config['clusterHostInfo']['namenode_host'][0]] = namenode_metadata_port + else: + namenode_metadata_port = '8020' ganglia_port = "8651" ganglia_collector_slaves_port = "8660" @@ -197,7 +200,9 @@ _falcon_host = default("/clusterHostInfo/falcon_server_hosts", None) _hbase_rs_hosts = default("/clusterHostInfo/hbase_rs_hosts", _slave_hosts) _hue_server_host = default("/clusterHostInfo/hue_server_host", None) all_hosts = config['clusterHostInfo']['all_hosts'] -nn_hosts_string = " ".join(namenode_host) + +if 'namenode_host' in config['clusterHostInfo']: + nn_hosts_string = " ".join(namenode_host) hostgroup_defs = {
