Add support for EBS volume configuration in EMR resources (#453)

cloudtools · Apr 14, 2016 · 12ab349 · 12ab349
1 parent 0288add
commit 12ab349
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/examples/EMR_Cluster.py b/examples/EMR_Cluster.py
@@ -86,7 +86,7 @@
 cluster = template.add_resource(emr.Cluster(
     "EMRSampleCluster",
     Name="EMR Sample Cluster",
-    ReleaseLabel='emr-4.3.0',
+    ReleaseLabel='emr-4.4.0',
     BootstrapActions=[emr.BootstrapActionConfig(
         Name='Dummy bootstrap action',
         ScriptBootstrapAction=emr.ScriptBootstrapActionConfig(
@@ -122,6 +122,18 @@
             ]
         )
     ],
+    EbsConfiguration=emr.EbsConfiguration(
+        EbsBlockDeviceConfig=[
+            emr.EbsBlockDeviceConfig(
+                VolumeSpecification=emr.VolumeSpecification(
+                    SizeInGB="100",
+                    VolumeType="standard"
+                ),
+                VolumesPerInstance="1"
+            )
+        ],
+        EbsOptimized="true"
+    ),
     JobFlowRole=Ref(emr_instance_profile),
     ServiceRole=Ref(emr_service_role),
     Instances=emr.JobFlowInstancesConfig(

diff --git a/tests/examples_output/EMR_Cluster.template b/tests/examples_output/EMR_Cluster.template
@@ -115,6 +115,18 @@
                         ]
                     }
                 ],
+                "EbsConfiguration": {
+                    "EbsBlockDeviceConfig": [
+                        {
+                            "VolumeSpecification": {
+                                "SizeInGB": "100",
+                                "VolumeType": "standard"
+                            },
+                            "VolumesPerInstance": "1"
+                        }
+                    ],
+                    "EbsOptimized": "true"
+                },
                 "Instances": {
                     "CoreInstanceGroup": {
                         "BidPrice": "20",
@@ -134,7 +146,7 @@
                     "Ref": "EMRInstanceProfile"
                 },
                 "Name": "EMR Sample Cluster",
-                "ReleaseLabel": "emr-4.3.0",
+                "ReleaseLabel": "emr-4.4.0",
                 "ServiceRole": {
                     "Ref": "EMRServiceRole"
                 },

diff --git a/troposphere/emr.py b/troposphere/emr.py
@@ -125,6 +125,36 @@ class JobFlowInstancesConfig(AWSProperty):
     }
 
 
+def volume_type_validator(x):
+    valid_values = ['standard', 'io1']
+    if x not in valid_values:
+        raise ValueError("VolumeType must be one of: %s" %
+                         ', '.join(valid_values))
+    return x
+
+
+class VolumeSpecification(AWSProperty):
+    props = {
+        'Iops': (integer, False),
+        'SizeInGB': (integer, True),
+        'VolumeType': (volume_type_validator, True)
+    }
+
+
+class EbsBlockDeviceConfig(AWSProperty):
+    props = {
+        'VolumeSpecification': (VolumeSpecification, True),
+        'VolumesPerInstance': (integer, False)
+    }
+
+
+class EbsConfiguration(AWSProperty):
+    props = {
+        'EbsBlockDeviceConfig': ([EbsBlockDeviceConfig], False),
+        'EbsOptimized': (boolean, False)
+    }
+
+
 class Cluster(AWSObject):
     resource_type = "AWS::EMR::Cluster"
 
@@ -133,6 +163,7 @@ class Cluster(AWSObject):
         'Applications': ([Application], False),
         'BootstrapActions': ([BootstrapActionConfig], False),
         'Configurations': (configurations_validator, False),
+        'EbsConfiguration': (EbsConfiguration, False),
         'Instances': (JobFlowInstancesConfig, True),
         'JobFlowRole': (basestring, True),
         'LogUri': (basestring, False),
@@ -150,6 +181,7 @@ class InstanceGroupConfig(AWSObject):
     props = {
         'BidPrice': (basestring, False),
         'Configurations': (configurations_validator, False),
+        'EbsConfiguration': (EbsConfiguration, False),
         'InstanceCount': (integer, True),
         'InstanceRole': (basestring, True),
         'InstanceType': (basestring, True),