Pārlūkot izejas kodu

AMBARI-538. Puppet layer assumes net-snmp* to be installed on all boxes (Contributed by ramya)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1351031 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 13 gadi atpakaļ
vecāks
revīzija
0e5c8ed5ab

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

@@ -4,11 +4,11 @@ class hdp-nagios::server::packages(
 {
   if ($service_state == 'no_op') {
   } elsif ($service_state in ['uninstalled']) {
-     hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-net-snmp-utils','nagios-addons']:
+     hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-addons']:
       ensure => 'uninstalled'
     }
   } elsif ($service_state in ['running','stopped','installed_and_configured']) {
-     hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-net-snmp-utils','nagios-addons','nagios-php-pecl-json']: 
+     hdp-nagios::server::package { ['nagios-server','nagios-fping','nagios-plugins','nagios-addons','nagios-php-pecl-json']: 
    }
   } 
   Hdp-nagios::Server::Package['nagios-plugins'] -> Hdp::Package['nagios-addons'] #other order produces package conflict

+ 2 - 2
hmc/puppet/modules/hdp/manifests/params.pp

@@ -185,8 +185,8 @@ class hdp::params()
     nagios-php-pecl-json => {
       64 => 'php-pecl-json.x86_64'
     },
-    nagios-net-snmp-utils => {
-      64 => 'net-snmp-utils'
+    snmp => {
+      64 => ['net-snmp','net-snmp-utils'],
     },
     dashboard => {
       64 => 'hdp_mon_dashboard'

+ 3 - 1
hmc/puppet/modules/hdp/manifests/snmp.pp

@@ -4,6 +4,8 @@ class hdp::snmp(
 {
   include hdp::params
 
+  hdp::package {'snmp':}
+
   hdp::snmp-configfile {'snmpd.conf': 
     notify => Service['snmpd']    
   }
@@ -12,7 +14,7 @@ class hdp::snmp(
     ensure => $service_state
   }
   
-  anchor{'hdp::snmp::begin':} -> Hdp::Snmp-configfile<||> -> Service['snmpd'] -> anchor{'hdp::snmp::end':}
+  anchor{'hdp::snmp::begin':} -> Hdp::Package['snmp'] -> Hdp::Snmp-configfile<||> -> Service['snmpd'] -> anchor{'hdp::snmp::end':}
 }
 
 define hdp::snmp-configfile()