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

[smohanty]

Author: smohanty
Date: Fri Mar 29 17:08:02 2013
New Revision: 1462540

URL: http://svn.apache.org/r1462540
Log:
AMBARI-1507. Should not install HDPHBaseMaster, HDPNameNode and HDPJobTracker 
ganglia configs on every node. (smohanty)

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

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1462540&r1=1462539&r2=1462540&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Mar 29 17:08:02 2013
@@ -534,6 +534,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1507. Should not install HDPHBaseMaster, HDPNameNode and HDPJobTracker
+ ganglia configs on every node. (smohanty)
+
  AMBARI-1746. Backend support for LDAP Group to Ambari Role Mapping. 
  (smohanty)
 

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp?rev=1462540&r1=1462539&r2=1462540&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
 Fri Mar 29 17:08:02 2013
@@ -91,12 +91,15 @@ class hdp-ganglia::monitor::config-gen()
 #    hdp-ganglia::config::generate_monitor { 'HDPSlaves':}
 #  }
 
-  # FIXME
-  # this will be enable gmond for all clusters on the node
-  # should be selective based on roles present
-  hdp-ganglia::config::generate_monitor { 'HDPNameNode':}
-  hdp-ganglia::config::generate_monitor { 'HDPJobTracker':}
-  hdp-ganglia::config::generate_monitor { 'HDPHBaseMaster':}
+  if ($hdp::params::is_namenode_master) {
+    hdp-ganglia::config::generate_monitor { 'HDPNameNode':}
+  }
+  if ($hdp::params::is_jtnode_master) {
+    hdp-ganglia::config::generate_monitor { 'HDPJobTracker':}
+  }
+  if ($hdp::params::is_hbase_master) {
+    hdp-ganglia::config::generate_monitor { 'HDPHBaseMaster':}
+  }
   hdp-ganglia::config::generate_monitor { 'HDPSlaves':}
 
   Hdp-ganglia::Config::Generate_monitor<||>{

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp?rev=1462540&r1=1462539&r2=1462540&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp/manifests/params.pp
 Fri Mar 29 17:08:02 2013
@@ -650,6 +650,10 @@ class hdp::params()
 ###### aux
   #used by ganglia monitor to tell what components and services are present
   $component_exists = {} 
-  $service_exists = {} 
+  $service_exists = {}
+
+  $is_namenode_master = $::fqdn in $namenode_host
+  $is_jtnode_master   = $::fqdn in $jtnode_host
+  $is_hbase_master    = $::fqdn in $hbase_master_hosts
 }