소스 검색

AMBARI-2582. Nagios webUI behaviour is strange after ambari-server reset. (Vitaly Brodetskyi vis smohanty)

Sumit Mohanty 12 년 전
부모
커밋
daff70daa6
1개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 3
      ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/packages.pp

+ 4 - 3
ambari-agent/src/main/puppet/modules/hdp-nagios/manifests/server/packages.pp

@@ -76,13 +76,14 @@ debug("## state: $service_state")
       package_type => 'nagios-plugins'
       package_type => 'nagios-plugins'
     }
     }
 
 
-    hdp::package::remove_pkg { 'nagios':
-      package_type => 'nagios'
+    exec { "remove_package nagios":
+      path    => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+      command => "rpm -e --allmatches --nopostun nagios ; true"
     }
     }
 
 
     debug("##Adding removing dep")
     debug("##Adding removing dep")
     # Removing conflicting packages. Names of packages being removed are hardcoded and not resolved via hdp::params
     # Removing conflicting packages. Names of packages being removed are hardcoded and not resolved via hdp::params
-    Hdp::Package::Remove_pkg['hdp_mon_nagios_addons'] -> Hdp::Package::Remove_pkg['nagios-plugins'] -> Hdp::Package::Remove_pkg['nagios'] -> Hdp::Package['nagios-plugins']
+    Hdp::Package::Remove_pkg['hdp_mon_nagios_addons'] -> Hdp::Package::Remove_pkg['nagios-plugins'] -> Exec['remove_package nagios'] -> Hdp::Package['nagios-plugins']
   }
   }
 
 
   Hdp::Package['nagios-plugins'] -> Hdp::Package['nagios-server'] -> Hdp::Package['nagios-fping'] -> Hdp::Package['nagios-addons'] -> Hdp::Package['nagios-php-pecl-json']
   Hdp::Package['nagios-plugins'] -> Hdp::Package['nagios-server'] -> Hdp::Package['nagios-fping'] -> Hdp::Package['nagios-addons'] -> Hdp::Package['nagios-php-pecl-json']