AMBARI-1950. Hadoop install was failed on SUSE-11.1sp1 cluster with all services except Hue. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1469023 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -745,6 +745,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1950. Hadoop install was failed on SUSE-11.1sp1 cluster with all 
+ services except Hue. (smohanty)
+
  AMBARI-1949. Reconfiguration of Services has issues and the configurations 
  save button does not take affect. (srimanth)
 

ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp

@@ -26,7 +26,24 @@ class hdp-nagios::params() inherits hdp::params
   $nagios_group = hdp_default("nagios_group",$nagios_default_group)
   
   $conf_dir = hdp_default("nagios_conf_dir","/etc/nagios")
-  $httpd_conf_file = "/etc/httpd/conf.d/nagios.conf"
+
+  if hdp_is_empty($hdp::params::services_names[httpd]) {
+    hdp_fail("There is no service name for service httpd")
+  } else {
+    $service_name_by_os = $hdp::params::services_names[httpd]
+  }
+
+  if hdp_is_empty($service_name_by_os[$hdp::params::hdp_os_type]) {
+    if hdp_is_empty($service_name_by_os['ALL']) {
+      hdp_fail("There is no service name for service httpd")
+    } else {
+      $service_name = $service_name_by_os['ALL']
+    }
+  } else {
+    $service_name = $service_name_by_os[$hdp::params::hdp_os_type]
+  }
+
+  $httpd_conf_file = "/etc/${service_name}/conf.d/nagios.conf"
 
   $plugins_dir = "/usr/lib64/nagios/plugins"
   $eventhandlers_dir = "/usr/lib64/nagios/eventhandlers"  # Does not exist yet