Merge pull request #1269 from buildkite/pdp-1983-add-parameters-for-io2-storage

Add RootVolumeIops parameter to allow io1 and io2 RootVolumeTypes

Author: triarius

templates/aws-stack.yml

@@ -373,6 +373,11 @@ Parameters:
     Type: String
     Default: "gp3"
 
+  RootVolumeIops:
+    Description: If the `RootVolumeType` is io1 or io2, the number of IOPS to provision for the root volume
+    Type: Number
+    Default: 1000
+
   RootVolumeEncrypted:
     Description: Indicates whether the EBS volume is encrypted
     Type: String
@@ -709,6 +714,11 @@ Conditions:
     UseStackNameForInstanceName:
       !Equals [ !Ref InstanceName, "" ]
 
+    IsRootVolumeIsIo1OrIo2:
+      !Or
+        - !Equals [ !Ref RootVolumeType, "io1" ]
+        - !Equals [ !Ref RootVolumeType, "io2" ]
+
 Mappings:
   ECRManagedPolicy:
     none      : { Policy: '' }
@@ -1133,7 +1143,11 @@ Resources:
                     - 'linuxamd64'
           BlockDeviceMappings:
             - DeviceName: !If [ UseDefaultRootVolumeName, !If [ UseWindowsAgents, /dev/sda1, /dev/xvda ], !Ref RootVolumeName ]
-              Ebs: { VolumeSize: !Ref RootVolumeSize, VolumeType: !Ref RootVolumeType, Encrypted: !Ref RootVolumeEncrypted }
+              Ebs:
+                VolumeSize: !Ref RootVolumeSize
+                VolumeType: !Ref RootVolumeType
+                Encrypted: !Ref RootVolumeEncrypted
+                Iops: !If [ IsRootVolumeIsIo1OrIo2, !Ref RootVolumeIops, !Ref "AWS::NoValue" ]
           TagSpecifications:
             - ResourceType: instance
               Tags: