feat: EC2 workspace root volume size can be configured (#1123)

This is useful when using custom AMIs that are larger than the default AMIs due to containing additional applications Co-authored-by: Sanket Dharwadkar <sdharwad@amazon.com>
awslabs · Feb 14, 2023 · 62b8ea8 · 62b8ea8
1 parent 180ca39
commit 62b8ea8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...packages/base-raas-cfn-templates/src/templates/service-catalog/ec2-linux-instance.cfn.yml b/...packages/base-raas-cfn-templates/src/templates/service-catalog/ec2-linux-instance.cfn.yml
@@ -44,6 +44,10 @@ Parameters:
   EncryptionKeyArn:
     Type: String
     Description: The ARN of the KMS encryption Key used to encrypt data in the instance
+  RootVolumeSize:
+    Type: Number
+    Description: The size of the root volume. Must be larger than the AMI size.
+    Default: 8
   EgressStoreIamPolicyDocument:
     Type: String
     Description: The IAM policy for launched workstation to access egress store
@@ -187,7 +191,7 @@ Resources:
       BlockDeviceMappings:
         - DeviceName: /dev/xvda
           Ebs:
-            VolumeSize: 8
+            VolumeSize: !Ref RootVolumeSize
             Encrypted: true
             KmsKeyId: !Ref EncryptionKeyArn
       PropagateTagsToVolumeOnCreation: true

diff --git a/...ckages/base-raas-cfn-templates/src/templates/service-catalog/ec2-windows-instance.cfn.yml b/...ckages/base-raas-cfn-templates/src/templates/service-catalog/ec2-windows-instance.cfn.yml
@@ -47,6 +47,10 @@ Parameters:
   EncryptionKeyArn:
     Type: String
     Description: The ARN of the KMS encryption Key used to encrypt data in the instance
+  RootVolumeSize:
+    Type: Number
+    Description: The size of the root volume. Must be larger than the AMI size.
+    Default: 30
   RaidDataVolumeSize:
     Type: Number
     Description: The size of each volume in the RAID array used to hold studies data, in GiB. The template creates a striped volume (RAID 0) by joining 8 volumes. The total size of the data volume would be roughly 8 times the size specified here.
@@ -196,7 +200,7 @@ Resources:
       BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:
-            VolumeSize: 30
+            VolumeSize: !Ref RootVolumeSize
             VolumeType: gp2
             Encrypted: true
             KmsKeyId: !Ref EncryptionKeyArn