svn commit: r1354278 - in /incubator/ambari/trunk: CHANGES.txt hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp

[hi...@apache.org]

Author: hitesh
Date: Tue Jun 26 22:31:44 2012
New Revision: 1354278

URL: http://svn.apache.org/viewvc?rev=1354278&view=rev
Log:
AMBARI-569. Nagios install fails on RHEL6 due to php-pecl-json dependency (Contributed by Hitesh)

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

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1354278&r1=1354277&r2=1354278&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jun 26 22:31:44 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 1.0.0 - unreleased
 
+  AMBARI-569. Nagios install fails on RHEL6 due to php-pecl-json dep (hitesh)
+
   AMBARI-546. Puppet fails to install 32-bit JDK properly on RHEL6 (hitesh)
 
   AMBARI-548. Puppet agent install script should use correct epel repo (hitesh)

Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp?rev=1354278&r1=1354277&r2=1354278&view=diff
==============================================================================
--- incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp (original)
+++ incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp Tue Jun 26 22:31:44 2012
@@ -8,8 +8,18 @@ class hdp-nagios::server::packages(
       ensure => 'uninstalled'
     }
   } elsif ($service_state in ['running','stopped','installed_and_configured']) {
-     hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-addons','nagios-php-pecl-json']: 
-   }
+    case $hdp::params::hdp_os_type {
+      centos6, rhel6: {
+        hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-addons']:
+          ensure => 'present'
+        }
+      }
+      default: {
+        hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-addons','nagios-php-pecl-json']:
+          ensure => 'present'
+        }
+      }
+    }
   } 
   Hdp-nagios::Server::Package['nagios-plugins'] -> Hdp::Package['nagios-addons'] #other order produces package conflict