svn commit: r1345385 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/orchestrator/Cluster.php

[vi...@apache.org]

Author: vikram
Date: Fri Jun  1 22:58:01 2012
New Revision: 1345385

URL: http://svn.apache.org/viewvc?rev=1345385&view=rev
Log:
AMBARI-312. Uninstall's wipe flag should be correctly passed to puppet (Contributed by Hitesh)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1345385&r1=1345384&r2=1345385&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri Jun  1 22:58:01 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-312. Uninstall's wipe flag should be correctly passed to puppet. (Hitesh via Vikram)
+
   AMBARI-307. Ensure recommended memory is never below 256 M. (Hitesh via Vikram)
 
   AMBARI-310. Externalize message resources for the welcome page. Update styles on various pages. (Yusaku via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php?rev=1345385&r1=1345384&r2=1345385&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/orchestrator/Cluster.php Fri Jun  1 22:58:01 2012
@@ -116,9 +116,15 @@ class Cluster {
         }
         return $result;
       }
+
+      $wipeoutFlag = "false";
+      if ($wipeoutData) {
+        $wipeoutFlag = "true";
+      }
+
       $nodes = $result["nodes"];
       $result = $this->puppet->kickPuppet($nodes, $transaction, $this->name,
-          $result["componentMapping"], array ("wipeoff_data" => $wipeoutData));
+          $result["componentMapping"], array ("wipeoff_data" => $wipeoutFlag));
       $this->logger->log_debug("Puppet kick response for uninstalling "
           . "cluster=" . $this->name
           . ", txn=" . $transaction->toString()