Selaa lähdekoodia

AMBARI-2057. Gmond left in init after install. (smohanty)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1477742 13f79535-47bb-0310-9956-ffa450edef68
Sumit Mohanty 12 vuotta sitten
vanhempi
commit
9d2e873b09

+ 2 - 0
CHANGES.txt

@@ -815,6 +815,8 @@ Trunk (unreleased changes):
 
 
  BUG FIXES
  BUG FIXES
 
 
+ AMBARI-2057. Gmond left in init after install. (smohanty)
+
  AMBARI-2051. Remove hard-coded ports from agent scripts - Nagios. (swagle)
  AMBARI-2051. Remove hard-coded ports from agent scripts - Nagios. (swagle)
 
 
  AMBARI-2045. Add Unit test to verify, client re-install for install failed 
  AMBARI-2045. Add Unit test to verify, client re-install for install failed 

+ 13 - 4
ambari-agent/src/main/puppet/modules/hdp-ganglia/manifests/server.pp

@@ -72,10 +72,11 @@ class hdp-ganglia::server(
   class { 'hdp-ganglia::server::gmetad': ensure => $service_state}
   class { 'hdp-ganglia::server::gmetad': ensure => $service_state}
 
 
   class { 'hdp-ganglia::service::change_permission': ensure => $service_state }
   class { 'hdp-ganglia::service::change_permission': ensure => $service_state }
-  
+
   if ($service_state == 'installed_and_configured') {
   if ($service_state == 'installed_and_configured') {
     $webserver_state = 'restart'
     $webserver_state = 'restart'
   } elsif ($service_state == 'running') {
   } elsif ($service_state == 'running') {
+    class { 'hdp-ganglia::server::delete_default_gmond_process': }
     $webserver_state = 'running'
     $webserver_state = 'running'
   } else {
   } else {
     # We are never stopping httpd
     # We are never stopping httpd
@@ -84,9 +85,9 @@ class hdp-ganglia::server(
 
 
   class { 'hdp-monitor-webserver': service_state => $webserver_state}
   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":
   file { "${hdp-ganglia::params::ganglia_dir}/gmetad.conf":
     owner => 'root',
     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']
+  }
+}