basic support for VPC subnets

ogrodnek · Sep 29, 2014 · 5dfe64d · 5dfe64d
1 parent a075f1b
commit 5dfe64d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ organizationName := "com.bizo"
 
 name := "spark-plug"
 
-version := "1.2.4"
+version := "1.2.4.1"
 
 scalaVersion := "2.10.3"
 

diff --git a/src/main/scala/com/bizo/hive/sparkplug/emr/Emr.scala b/src/main/scala/com/bizo/hive/sparkplug/emr/Emr.scala
@@ -57,6 +57,8 @@ class Emr private(credentials: Option[AWSCredentials]) {
     for (az <- config.availabilityZone) {
       flow.setPlacement(new PlacementType().withAvailabilityZone(az))
     }
+
+    flow.setEc2SubnetId(config.subnetId.orNull)
 
     val groups = instances.map(toInstanceGroupConfig(config, _))
 

diff --git a/src/main/scala/com/bizo/hive/sparkplug/emr/config.scala b/src/main/scala/com/bizo/hive/sparkplug/emr/config.scala
@@ -12,6 +12,7 @@ trait ClusterConfig {
   def availabilityZone: Option[String] = None
   def jobFlowRole: Option[String] = None
   def serviceRole: Option[String] = None
+  def subnetId: Option[String] = None
 }
 
 class DefaultBidProvider extends BidProvider {