Updated Branches: refs/heads/trunk bbb767f76 -> ce5fba55a
AMBARI-2730. Garbage code in hdp-ganglia::monitor_and_server.pp. (Andrew Onischuk via mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/ce5fba55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/ce5fba55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/ce5fba55 Branch: refs/heads/trunk Commit: ce5fba55ab804062c6841e50727b1d2fd84a416e Parents: bbb767f Author: Mahadev Konar <[email protected]> Authored: Mon Jul 29 15:44:44 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Mon Jul 29 15:44:44 2013 -0700 ---------------------------------------------------------------------- .../hdp-ganglia/manifests/monitor_and_server.pp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/ce5fba55/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp index 43161c3..83fe2d7 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp +++ b/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/monitor_and_server.pp @@ -59,30 +59,19 @@ class hdp-ganglia::monitor_and_server( } class {'hdp-ganglia::monitor::config-gen': } - - class {'hdp-ganglia::server::config-gen': } + hdp-ganglia::config::generate_server { 'gmetad': ganglia_service => 'gmetad' } - class { 'hdp-ganglia::service::gmond': - ensure => $service_state - } - - class { 'hdp-ganglia::server::services' : - service_state => $service_state, - monitor_and_server_single_node => true - } - class { 'hdp-ganglia::service::change_permission': ensure => $service_state } #top level no anchors needed Class['hdp-ganglia'] -> Class['hdp-ganglia::server::packages'] -> Class['hdp-ganglia::config'] -> - Class['hdp-ganglia::monitor::config-gen'] -> Class['hdp-ganglia::server::config-gen'] -> Hdp-ganglia::Config::Generate_server['gmetad'] -> - Class['hdp-ganglia::service::gmond'] -> Class['hdp-ganglia::server::services'] -> + Class['hdp-ganglia::monitor::config-gen'] -> Hdp-ganglia::Config::Generate_server['gmetad'] -> Class['hdp-ganglia::service::change_permission'] } else { hdp_fail("TODO not implemented yet: service_state = ${service_state}")
