svn commit: r1347119 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/php/db/HMCDBAccessor.php hmc/php/frontend/createCluster.php hmc/php/frontend/uninstall/cleanupProcesses.php

[vi...@apache.org]

Author: vikram
Date: Wed Jun  6 21:00:08 2012
New Revision: 1347119

URL: http://svn.apache.org/viewvc?rev=1347119&view=rev
Log:
AMBARI-370. Uninstall needs to clear Puppet directories  (Contributed by Vikram)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php
    incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php
    incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/cleanupProcesses.php

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347119&r1=1347118&r2=1347119&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Wed Jun  6 21:00:08 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-370. Uninstall needs to clear Puppet directories (Vikram)
+
   AMBARI-368. Server restart kills puppet agent. (Mahadev via Vikram)
 
   AMBARI-366. Package up the fonts/ subdirectory in the HMC RPM (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php?rev=1347119&r1=1347118&r2=1347119&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/db/HMCDBAccessor.php Wed Jun  6 21:00:08 2012
@@ -3282,10 +3282,5 @@ class HMCDBAccessor {
     $this->cleanupHosts($clusterName);
   }
 
-  public function deleteCluster ($clusterName) {
-    $this->deleteClusterTable($clusterName, "SubTransactionStatus");
-    $this->deleteClusterTable($clusterName, "TransactionStatus");
-    $this->cleanupCluster($clusterName);
-  }
 }
 ?>

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php?rev=1347119&r1=1347118&r2=1347119&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/createCluster.php Wed Jun  6 21:00:08 2012
@@ -60,7 +60,7 @@ if ($fileHdl == false) {
 fclose($fileHdl);
 
 // if user re-enters this page, we need to delete and restart the cluster conf
-$dbAccessor->deleteCluster($clusterName);
+$dbAccessor->cleanupCluster($clusterName);
 $logger->log_debug("Completed deletion of cluster: ".$clusterName);
 
 $hdpVersion="1.0"; // TODO: hardcoded

Modified: incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/cleanupProcesses.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/cleanupProcesses.php?rev=1347119&r1=1347118&r2=1347119&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/cleanupProcesses.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/frontend/uninstall/cleanupProcesses.php Wed Jun  6 21:00:08 2012
@@ -11,8 +11,7 @@ $logger = new HMCLogger("CleanupProcesse
 $dbAccessor = new HMCDBAccessor($GLOBALS["DB_PATH"]);
 
 function getCommandLine() {
-  $cmdLine = "touch /etc/default/hadoop-env.sh ; killall puppet; rm -rf /var/log/puppet_agent.log; rm -rf /etc/yum.repos.d/hdp* ; ";
-  $cmdLine = $cmdLine . 'sleep $[ $RANDOM % 5 ]; ';
+  $cmdLine = " killall puppet ; rm -rf /var/lib/puppet/ssl ; ";
   return $cmdLine;
 }