You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/08/23 22:47:05 UTC
git commit: AMBARI-3007. Adding a client only host results in
deployment of gmond but it does not start. (swagle)
Updated Branches:
refs/heads/branch-1.4 c29c03a88 -> 877d60544
AMBARI-3007. Adding a client only host results in deployment of gmond but it does not start. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/877d6054
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/877d6054
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/877d6054
Branch: refs/heads/branch-1.4
Commit: 877d60544d42eba6f16e6c99ba34853955909b4c
Parents: c29c03a
Author: Siddharth Wagle <sw...@hortonworks.com>
Authored: Fri Aug 23 13:46:43 2013 -0700
Committer: Siddharth Wagle <sw...@hortonworks.com>
Committed: Fri Aug 23 13:46:43 2013 -0700
----------------------------------------------------------------------
.../src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp | 7 ++++++-
.../src/main/puppet/modules/hdp-ganglia/manifests/server.pp | 8 +++-----
.../modules/hdp-ganglia/templates/gangliaClusters.conf.erb | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/877d6054/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
index 1452390..965eb30 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor.pp
@@ -98,7 +98,12 @@ class hdp-ganglia::monitor::config-gen()
hdp-ganglia::config::generate_daemon { 'HDPHBaseMaster':}
}
- if ($hdp::params::is_slave) {
+ if (($hdp::params::is_slave == true)
+ or (($hdp::params::is_namenode_master == false)
+ and ($hdp::params::is_jtnode_master == false)
+ and ($hdp::params::is_rmnode_master == false)
+ and ($hdp::params::is_hsnode_master == false)
+ and ($hdp::params::is_hbase_master == false))) {
hdp-ganglia::config::generate_daemon { 'HDPSlaves':}
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/877d6054/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 4ac7c8f..7dca30c 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
@@ -87,11 +87,9 @@ class hdp-ganglia::server(
}
}
- if ($hdp::params::has_slaves) {
- hdp-ganglia::config::generate_daemon { 'HDPSlaves':
- ganglia_service => 'gmond',
- role => 'server'
- }
+ hdp-ganglia::config::generate_daemon { 'HDPSlaves':
+ ganglia_service => 'gmond',
+ role => 'server'
}
hdp-ganglia::config::generate_daemon { 'gmetad':
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/877d6054/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb b/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
index 7224c01..5e03bd5 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
+++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/templates/gangliaClusters.conf.erb
@@ -19,9 +19,9 @@
#########################################################
### ClusterName GmondMasterHost GmondPort ###
#########################################################
-<% if (scope.function_hdp_default('slave_hosts') != '')%>
+
HDPSlaves <%=scope.function_hdp_host("ganglia_server_host")%> 8660
-<%end-%>
+
<% if (scope.function_hdp_default('namenode_host') != '')%>
HDPNameNode <%=scope.function_hdp_host("ganglia_server_host")%> 8661
<%end-%>