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

[smohanty]

Author: smohanty
Date: Tue Apr 30 18:00:51 2013
New Revision: 1477742

URL: http://svn.apache.org/r1477742
Log:
AMBARI-2057. Gmond left in init after install. (smohanty)

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

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1477742&r1=1477741&r2=1477742&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Apr 30 18:00:51 2013
@@ -815,6 +815,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2057. Gmond left in init after install. (smohanty)
+
  AMBARI-2051. Remove hard-coded ports from agent scripts - Nagios. (swagle)
 
  AMBARI-2045. Add Unit test to verify, client re-install for install failed 

Modified: 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp?rev=1477742&r1=1477741&r2=1477742&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
 (original)
+++ 
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp
 Tue Apr 30 18:00:51 2013
@@ -72,10 +72,11 @@ class hdp-ganglia::server(
   class { 'hdp-ganglia::server::gmetad': ensure => $service_state}
 
   class { 'hdp-ganglia::service::change_permission': ensure => $service_state }
-  
+
   if ($service_state == 'installed_and_configured') {
     $webserver_state = 'restart'
   } elsif ($service_state == 'running') {
+    class { 'hdp-ganglia::server::delete_default_gmond_process': }
     $webserver_state = 'running'
   } else {
     # We are never stopping httpd
@@ -84,9 +85,9 @@ class hdp-ganglia::server(
 
   class { 'hdp-monitor-webserver': service_state => $webserver_state}
 
-   class { 'hdp-ganglia::server::files':
-      ensure => 'present'
-   }
+  class { 'hdp-ganglia::server::files':
+     ensure => 'present'
+  }
 
   file { "${hdp-ganglia::params::ganglia_dir}/gmetad.conf":
     owner => 'root',
@@ -219,3 +220,11 @@ class hdp-ganglia::server::gmetad(
     }
   }
 }
+
+class hdp-ganglia::server::delete_default_gmond_process() {
+  hdp::exec { "delete_default_gmond_process" :
+    command => "chkconfig --del gmond",
+    path => '/usr/sbin:/sbin:/usr/local/bin:/bin:/usr/bin',
+    require => Class['hdp-ganglia::server::packages']
+  }
+}