Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 669D9D0CE for ; Tue, 21 Aug 2012 21:41:37 +0000 (UTC) Received: (qmail 60673 invoked by uid 500); 21 Aug 2012 21:41:37 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 60651 invoked by uid 500); 21 Aug 2012 21:41:37 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 60643 invoked by uid 99); 21 Aug 2012 21:41:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2012 21:41:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2012 21:41:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 45C8723888FE; Tue, 21 Aug 2012 21:40:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1375811 - in /incubator/ambari/trunk: CHANGES.txt hmc/puppet/modules/hdp-nagios/manifests/server.pp Date: Tue, 21 Aug 2012 21:40:53 -0000 To: ambari-commits@incubator.apache.org From: jitendra@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120821214053.45C8723888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jitendra Date: Tue Aug 21 21:40:52 2012 New Revision: 1375811 URL: http://svn.apache.org/viewvc?rev=1375811&view=rev Log: AMBARI-674. Nagios uninstall should cleanup temporary directories. Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server.pp Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1375811&r1=1375810&r2=1375811&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Tue Aug 21 21:40:52 2012 @@ -86,6 +86,8 @@ Trunk (unreleased changes) BUG FIXES + AMBARI-674. Nagios uninstall should cleanup temporary directories. (jitendra) + AMBARI-673. Going back to step 3 from step 5 in UI breaks DB (Jaimin Jetly via yusaku) Modified: incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server.pp URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server.pp?rev=1375811&r1=1375810&r2=1375811&view=diff ============================================================================== --- incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server.pp (original) +++ incubator/ambari/trunk/hmc/puppet/modules/hdp-nagios/manifests/server.pp Tue Aug 21 21:40:52 2012 @@ -38,6 +38,11 @@ class hdp-nagios::server( unless => "test ! -e /var/nagios/rw/nagios.cmd" } + hdp::exec { "rm -rf /tmp/hadoop-nagios" : + command => "rm -rf /tmp/hadoop-nagios", + unless => "test ! -e /tmp/hadoop-nagios" + } + hdp::directory { $nagios_config_dir: service_state => $service_state, force => true