WHIRR-101. Hadoop on EC2 does not use the /mnt partition.

git-svn-id: https://svn.apache.org/repos/asf/incubator/whirr/trunk@1004106 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -34,6 +34,8 @@ Trunk (unreleased changes)
 
     WHIRR-108. Fix checkstyle and rat violations. (tomwhite)
 
+    WHIRR-101. Hadoop on EC2 does not use the /mnt partition. (tomwhite)
+
 Release 0.1.0 - 2010-09-02
 
   INCOMPATIBLE CHANGES

scripts/apache/hadoop/install

@@ -147,8 +147,14 @@ function make_hadoop_dirs {
 
 # Configure Hadoop by setting up disks and site file
 function configure_hadoop() {
-
-  MOUNT=/data
+  case $CLOUD_PROVIDER in
+  ec2)
+    MOUNT=/mnt
+    ;;
+  *)
+    MOUNT=/data
+    ;;
+  esac
   FIRST_MOUNT=$MOUNT
   DFS_NAME_DIR=$MOUNT/hadoop/hdfs/name
   FS_CHECKPOINT_DIR=$MOUNT/hadoop/hdfs/secondary

scripts/cloudera/cdh/install

@@ -144,8 +144,14 @@ function make_hadoop_dirs {
 
 # Configure Hadoop by setting up disks and site file
 function configure_hadoop() {
-
-  MOUNT=/data
+  case $CLOUD_PROVIDER in
+  ec2)
+    MOUNT=/mnt
+    ;;
+  *)
+    MOUNT=/data
+    ;;
+  esac
   FIRST_MOUNT=$MOUNT
   DFS_NAME_DIR=$MOUNT/hadoop/hdfs/name
   FS_CHECKPOINT_DIR=$MOUNT/hadoop/hdfs/secondary

services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java

@@ -131,10 +131,11 @@ public HadoopCluster launchCluster(ClusterSpec clusterSpec) throws IOException {
     // Launch slaves (DN and TT)
     Payload slaveBootScript = newStringPayload(runUrls(clusterSpec.getRunUrlBase(),
       "sun/java/install",
-      String.format("%s dn,tt -n %s -j %s",
+      String.format("%s dn,tt -n %s -j %s -c %s",
           hadoopInstallRunUrl,
           namenodePublicAddress.getHostName(),
-          jobtrackerPublicAddress.getHostName())));
+          jobtrackerPublicAddress.getHostName(),
+          clusterSpec.getProvider())));
 
     TemplateBuilder slaveTemplateBuilder = computeService.templateBuilder()
       .options(runScript(slaveBootScript)