AMBARI-6372. Nagios install fails if hbase service is unavailable.(vbrodetskyi)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/scripts/params.py

@@ -125,7 +125,8 @@ _flume_hosts = default("/clusterHostInfo/flume_hosts", None)
 _nagios_server_host = default("/clusterHostInfo/nagios_server_host",None)
 _ganglia_server_host = default("/clusterHostInfo/ganglia_server_host",None)
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts",None)
-hbase_master_hosts_in_str = ','.join(hbase_master_hosts)
+if type(hbase_master_hosts) is list:
+  hbase_master_hosts_in_str = ','.join(hbase_master_hosts)
 _hive_server_host = default("/clusterHostInfo/hive_server_host",None)
 _oozie_server = default("/clusterHostInfo/oozie_server",None)
 _webhcat_server_host = default("/clusterHostInfo/webhcat_server_host",None)

ambari-server/src/main/resources/stacks/HDP/1.3.2/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -488,6 +488,7 @@ define service {
 #         retry_check_interval    1
 #         max_check_attempts      3
 # #}
+{% if hostgroup_defs['hbasemasters'] %}
 {% if check_cpu_on %}
 define service {
         hostgroup_name          nagios-server
@@ -501,6 +502,7 @@ define service {
         max_check_attempts      5
 }
 {%  endif %}
+{%  endif %}
 
 {%  for hbasemaster in hbase_master_hosts %}
 define service {

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/scripts/params.py

@@ -200,7 +200,8 @@ _supervisor_hosts = default("/clusterHostInfo/supervisor_hosts",None)
 _storm_ui_host = default("/clusterHostInfo/storm_ui_server_hosts",None)
 _storm_rest_api_hosts = default("/clusterHostInfo/storm_rest_api_hosts",None)
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts",None)
-hbase_master_hosts_in_str = ','.join(hbase_master_hosts)
+if type(hbase_master_hosts) is list:
+  hbase_master_hosts_in_str = ','.join(hbase_master_hosts)
 _hive_server_host = default("/clusterHostInfo/hive_server_host",None)
 _oozie_server = default("/clusterHostInfo/oozie_server",None)
 _webhcat_server_host = default("/clusterHostInfo/webhcat_server_host",None)

ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/templates/hadoop-services.cfg.j2

@@ -656,6 +656,7 @@ define service {
 #         retry_check_interval    1
 #         max_check_attempts      3
 # #}
+{% if hostgroup_defs['hbasemasters'] %}
 {% if check_cpu_on %}
 define service {
         hostgroup_name          nagios-server
@@ -669,6 +670,7 @@ define service {
         max_check_attempts      5
 }
 {%  endif %}
+{%  endif %}
 
 {%  for hbasemaster in hbase_master_hosts  %}
 define service {