AMBARI-569. Nagios install fails on RHEL6 due to php-pecl-json dependency (Contributed by Hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1354278 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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)

hmc/puppet/modules/hdp-nagios/manifests/server/packages.pp

@@ -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