svn commit: r1469023 - in /incubator/ambari/trunk: CHANGES.txt ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp

[sm...@apache.org]

Author: smohanty
Date: Wed Apr 17 18:48:22 2013
New Revision: 1469023

URL: http://svn.apache.org/r1469023
Log:
AMBARI-1950. Hadoop install was failed on SUSE-11.1sp1 cluster with all services except Hue. (smohanty)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1469023&r1=1469022&r2=1469023&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Apr 17 18:48:22 2013
@@ -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)
 

Modified: incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp?rev=1469023&r1=1469022&r2=1469023&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/params.pp Wed Apr 17 18:48:22 2013
@@ -26,7 +26,24 @@ class hdp-nagios::params() inherits hdp:
   $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