AMBARI-245. Support data cleanup if installation fails

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

CHANGES.txt

@@ -2,6 +2,8 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-245. Support data cleanup if installation fails (Jitendra via ramya)
+
   AMBARI-248. Add yuiCombinator.php to rpm (Jitendra via ramya)
 
   AMBARI-297. Modal dialog box for showing deploy progress looks broken

hmc/php/orchestrator/Cluster.php

@@ -118,7 +118,7 @@ class Cluster {
       }
       $nodes = $result["nodes"];
       $result = $this->puppet->kickPuppet($nodes, $transaction, $this->name,
-          $result["componentMapping"], array ("wipeoutData" => $wipeoutData));
+          $result["componentMapping"], array ("wipeoff_data" => $wipeoutData));
       $this->logger->log_debug("Puppet kick response for uninstalling "
           . "cluster=" . $this->name
           . ", txn=" . $transaction->toString()

hmc/php/puppet/PuppetInvoker.php

@@ -102,7 +102,8 @@
        return array($hostInfo, $configInfo, $hostRolesStates, $hostAttributes);
     }
 
-    public function kickPuppet($nodes, $txnObj, $clusterName, $nodesComponents) {
+    public function kickPuppet($nodes, $txnObj, $clusterName, $nodesComponents,
+        $globalOptions) {
       //Get host config from db
       $txnId = $txnObj->toString();
       $components = array_keys($nodesComponents);
@@ -111,6 +112,14 @@
       $configInfo = $infoFromDb[1];
       $hostRolesStates = $infoFromDb[2];
       $hostAttributes = $infoFromDb[3];
+
+      //Treat globalOpts as configs only
+      if (!empty($globalOptions)) {
+        foreach ($globalOptions as $key => $value) {
+          $configInfo[$key] = $value;
+        }
+      }
+       
       $response = $this->genKickWait($nodes, $txnId, $clusterName, $hostInfo,
           $configInfo, $hostRolesStates, $hostAttributes, $GLOBALS["puppetManifestDir"],
           $GLOBALS["puppetKickVersionFile"], $GLOBALS["DRYRUN"]);

hmc/php/puppet/genmanifest/hostsConfig.php

@@ -75,7 +75,8 @@ class HostsConfigManifest {
       }
       $manifest = "$" . $key . " = ";
       if ( ($key == "lzo_enabled") ||
-           ($key == "snappy_enabled") ) {
+           ($key == "snappy_enabled") || 
+           ($key == "wipeoff_data") ) {
         $manifest = $manifest . $value . "\n";
       } else {
         $manifest = $manifest . "\"" .  $value . "\"\n";