svn commit: r1054520 - in /incubator/whirr/trunk: CHANGES.txt services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java

[to...@apache.org]

Author: tomwhite
Date: Mon Jan  3 04:09:46 2011
New Revision: 1054520

URL: http://svn.apache.org/viewvc?rev=1054520&view=rev
Log:
WHIRR-176. Set AWS credentials in the local site file for Hadoop S3 access. Contributed by Lars George.

Modified:
    incubator/whirr/trunk/CHANGES.txt
    incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java

Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1054520&r1=1054519&r2=1054520&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Jan  3 04:09:46 2011
@@ -6,6 +6,9 @@ Trunk (unreleased changes)
 
     WHIRR-117. Composable services. (tomwhite)
 
+    WHIRR-176. Set AWS credentials in the local site file for Hadoop S3 access.
+    (Lars George via tomwhite)
+
   IMPROVEMENTS
 
     WHIRR-87. Parallelize Hadoop cluster creation. (tomwhite)

Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java?rev=1054520&r1=1054519&r2=1054520&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java Mon Jan  3 04:09:46 2011
@@ -123,19 +123,26 @@ public class HadoopNameNodeClusterAction
 
     LOG.info("Web UI available at http://{}",
       DnsUtil.resolveAddress(namenodePublicAddress.getHostAddress()));
-    Properties config = createClientSideProperties(namenodePublicAddress, jobtrackerPublicAddress);
+    Properties config = createClientSideProperties(clusterSpec, namenodePublicAddress, jobtrackerPublicAddress);
     createClientSideHadoopSiteFile(clusterSpec, config);
     createProxyScript(clusterSpec, cluster);
     event.setCluster(new Cluster(cluster.getInstances(), config));
   }
-  
-  private Properties createClientSideProperties(InetAddress namenode, InetAddress jobtracker) throws IOException {
+
+  private Properties createClientSideProperties(ClusterSpec clusterSpec,
+      InetAddress namenode, InetAddress jobtracker) throws IOException {
     Properties config = new Properties();
     config.setProperty("hadoop.job.ugi", "root,root");
     config.setProperty("fs.default.name", String.format("hdfs://%s:8020/", DnsUtil.resolveAddress(namenode.getHostAddress())));
     config.setProperty("mapred.job.tracker", String.format("%s:8021", DnsUtil.resolveAddress(jobtracker.getHostAddress())));
     config.setProperty("hadoop.socks.server", "localhost:6666");
     config.setProperty("hadoop.rpc.socket.factory.class.default", "org.apache.hadoop.net.SocksSocketFactory");
+    if ("ec2".equals(clusterSpec.getProvider())) {
+      config.setProperty("fs.s3.awsAccessKeyId", clusterSpec.getIdentity());
+      config.setProperty("fs.s3.awsSecretAccessKey", clusterSpec.getCredential());
+      config.setProperty("fs.s3n.awsAccessKeyId", clusterSpec.getIdentity());
+      config.setProperty("fs.s3n.awsSecretAccessKey", clusterSpec.getCredential());
+    }
     return config;
   }