incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject git commit: AMBARI-2844. HistoryServer2 and RM files not on Ganglia. (ncole)
Date Fri, 09 Aug 2013 11:57:40 GMT
Updated Branches:
  refs/heads/trunk 03e5152ce -> f9f3e51a9


AMBARI-2844. HistoryServer2 and RM files not on Ganglia. (ncole)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f9f3e51a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f9f3e51a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f9f3e51a

Branch: refs/heads/trunk
Commit: f9f3e51a95b536d16f00a84a56eeb5a7e92b3294
Parents: 03e5152
Author: Nate Cole <ncole@hortonworks.com>
Authored: Thu Aug 8 14:43:31 2013 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Fri Aug 9 07:54:32 2013 -0400

----------------------------------------------------------------------
 .../main/puppet/modules/hdp-ganglia/manifests/server.pp  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f9f3e51a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
index 911c229..d254652 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
@@ -70,14 +70,9 @@ class hdp-ganglia::server(
       role => 'server'
     }
   }
-  if ($hdp::params::is_rmnode_master) {
-    hdp-ganglia::config::generate_server { 'HDPResourceManager':
-      ganglia_service => 'gmond',
-      role => 'server'
-    }
-  }
-  if ($hdp::params::is_hsnode_master) {
-    hdp-ganglia::config::generate_server { 'HDPHistoryServer':
+
+  if (hdp_get_major_stack_version($stack_version) >= 2) {
+    hdp-ganglia::config::generate_server { ['HDPResourceManager', 'HDPHistoryServer']:
       ganglia_service => 'gmond',
       role => 'server'
     }


Mime
View raw message