incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347250 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/puppet/modules/hdp-nagios/manifests/server.pp
Date Thu, 07 Jun 2012 01:11:31 GMT
Author: vikram
Date: Thu Jun  7 01:11:31 2012
New Revision: 1347250

URL: http://svn.apache.org/viewvc?rev=1347250&view=rev
Log:
AMBARI-443 Nagios start fails on reinstall. Fix for prev commit. (Contributed by Ramya)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server.pp

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347250&r1=1347249&r2=1347250&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 01:11:31 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-443. Nagios start fails on reinstall. Fix for previous patch. (Ramya via Vikram)
+
   AMBARI-443. Nagios start fails on reinstall (Ramya via Vikram)
 
   AMBARI-442 Duplicate definition: Class[Hdp-hbase::Regionserver::Enable-ganglia] (Ramya
via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server.pp?rev=1347250&r1=1347249&r2=1347250&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server.pp
(original)
+++ incubator/ambari/branches/ambari-186/hmc/puppet/modules/hdp-nagios/manifests/server.pp
Thu Jun  7 01:11:31 2012
@@ -13,12 +13,11 @@ class hdp-nagios::server(
       service_state => uninstalled
     }
 
-    if ($wipeoff_data == true) {
-      hdp::exec { "rm -f /var/nagios/rw/nagios.cmd" :
-        command => "rm -f /var/nagios/rw/nagios.cmd",
-        unless => "test ! -e  /var/nagios/rw/nagios.cmd"
-      }
+    hdp::exec { "rm -f /var/nagios/rw/nagios.cmd" :
+      command => "rm -f /var/nagios/rw/nagios.cmd",
+      unless => "test ! -e  /var/nagios/rw/nagios.cmd"
     }
+
     hdp::directory { $nagios_config_dir:
       service_state => $service_state,
       force => true
@@ -33,11 +32,9 @@ class hdp-nagios::server(
       service_state => $service_state,
       force => true
     }
-    if ($wipeoff_data == true) {
+
      Class['hdp-nagios::server::packages'] -> Exec['rm -f /var/nagios/rw/nagios.cmd']
-> Hdp::Directory[$nagios_config_dir] -> Hdp::Directory[$plugins_dir] -> Hdp::Directory[$nagios_obj_dir]
-    } else {
-     Class['hdp-nagios::server::packages'] -> Hdp::Directory[$nagios_config_dir] ->
Hdp::Directory[$plugins_dir] -> Hdp::Directory[$nagios_obj_dir]
-    }
+
   } elsif ($service_state in ['running','stopped','installed_and_configured']) {
     class { 'hdp-nagios::server::packages' : }
 



Mime
View raw message