Merge pull request #109 from lorengordon/snapshot

Supports creating the AppVolume from an EBS Snapshot
plus3it · Mar 7, 2019 · 9630506 · 9630506
2 parents 8c303b0 + 892c090
commit 9630506
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 8 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.12.0
+current_version = 1.13.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/modules/lx-autoscale/main.tf b/modules/lx-autoscale/main.tf
@@ -24,6 +24,7 @@ resource "aws_cloudformation_stack" "watchmaker-lx-autoscale" {
     AppVolumeDevice             = "${var.AppVolumeDevice}"
     AppVolumeMountPath          = "${var.AppVolumeMountPath}"
     AppVolumeSize               = "${var.AppVolumeSize}"
+    AppVolumeSnapshotId         = "${var.AppVolumeSnapshotId}"
     AppVolumeType               = "${var.AppVolumeType}"
     AsgMetrics                  = "${join(",", var.AsgMetrics)}"
     AsgNotificationTypes        = "${join(",", var.AsgNotificationTypes)}"

diff --git a/modules/lx-autoscale/variables.tf b/modules/lx-autoscale/variables.tf
@@ -125,6 +125,12 @@ variable "AppVolumeSize" {
   default     = "1"
 }
 
+variable "AppVolumeSnapshotId" {
+  type        = "string"
+  description = "(Optional) EBS Snapshot ID from which to create the AppVolume. \"AppVolumeSize\" must be equal or greater than the size of the snapshot. Ignored if \"AppVolumeDevice\" is false"
+  default     = ""
+}
+
 variable "KeyPairName" {
   type        = "string"
   description = "Public/private key pairs allow you to securely connect to your instance after it launches"

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml
@@ -57,6 +57,10 @@ Conditions:
     - !Equals
       - !Ref WatchmakerAdminUsers
       - ''
+  UseAppVolumeSnapshot: !Not
+    - !Equals
+      - !Ref AppVolumeSnapshotId
+      - ''
   UseAsgMetricsCollection: !Not
     - !Equals
       - !Join [ "," , !Ref AsgMetrics]
@@ -203,6 +207,7 @@ Metadata:
           - AppVolumeDevice
           - AppVolumeMountPath
           - AppVolumeSize
+          - AppVolumeSnapshotId
           - AppVolumeType
       - Label:
           default: AutoScale Configuration
@@ -238,7 +243,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 1.12.0
+  Version: 1.13.0
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -306,17 +311,25 @@ Parameters:
     Default: /opt/data
     Description: >-
       Filesystem path to mount the extra app volume. Ignored if
-      "AppVolumeDevice" is blank
+      "AppVolumeDevice" is false
     Type: String
   AppVolumeSize:
     ConstraintDescription: Must be between 1GB and 16384GB.
     Default: 1
     Description: >-
       Size in GB of the EBS volume to create. Ignored if "AppVolumeDevice" is
-      blank
+      false
     MaxValue: 16384
     MinValue: 1
     Type: Number
+  AppVolumeSnapshotId:
+    AllowedPattern: '^$|snap-[a-z0-9]+'
+    Default: ''
+    Description: >-
+      (Optional) EBS Snapshot ID from which to create the AppVolume. "AppVolumeSize"
+      must be equal or greater than the size of the snapshot. Ignored if "AppVolumeDevice"
+      is false
+    Type: String
   AppVolumeType:
     AllowedValues:
       - gp2
@@ -325,7 +338,7 @@ Parameters:
       - st1
       - standard
     Default: gp2
-    Description: Type of EBS volume to create. Ignored if "AppVolumeDevice" is blank
+    Description: Type of EBS volume to create. Ignored if "AppVolumeDevice" is false
     Type: String
   AsgMetrics:
     Default: ''
@@ -948,6 +961,10 @@ Resources:
           - DeviceName: /dev/xvdf
             Ebs:
               DeleteOnTermination: true
+              SnapshotId: !If
+                - UseAppVolumeSnapshot
+                - !Ref AppVolumeSnapshotId
+                - !Ref 'AWS::NoValue'
               VolumeSize: !Ref AppVolumeSize
               VolumeType: !Ref AppVolumeType
           - !Ref 'AWS::NoValue'

diff --git a/modules/lx-instance/main.tf b/modules/lx-instance/main.tf
@@ -24,6 +24,7 @@ resource "aws_cloudformation_stack" "watchmaker-lx-instance" {
     AppVolumeDevice        = "${var.AppVolumeDevice}"
     AppVolumeMountPath     = "${var.AppVolumeMountPath}"
     AppVolumeSize          = "${var.AppVolumeSize}"
+    AppVolumeSnapshotId    = "${var.AppVolumeSnapshotId}"
     AppVolumeType          = "${var.AppVolumeType}"
     CfnBootstrapUtilsUrl   = "${var.CfnBootstrapUtilsUrl}"
     CfnEndpointUrl         = "${var.CfnEndpointUrl}"

diff --git a/modules/lx-instance/variables.tf b/modules/lx-instance/variables.tf
@@ -125,6 +125,12 @@ variable "AppVolumeSize" {
   default     = "1"
 }
 
+variable "AppVolumeSnapshotId" {
+  type        = "string"
+  description = "(Optional) EBS Snapshot ID from which to create the AppVolume. \"AppVolumeSize\" must be equal or greater than the size of the snapshot. Ignored if \"AppVolumeDevice\" is false"
+  default     = ""
+}
+
 variable "KeyPairName" {
   type        = "string"
   description = "Public/private key pairs allow you to securely connect to your instance after it launches"

diff --git a/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml b/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml
@@ -53,6 +53,10 @@ Conditions:
     - !Equals
       - !Ref WatchmakerAdminUsers
       - ''
+  UseAppVolumeSnapshot: !Not
+    - !Equals
+      - !Ref AppVolumeSnapshotId
+      - ''
   UseCfnUrl: !Not
     - !Equals
       - !Ref CfnEndpointUrl
@@ -171,6 +175,7 @@ Metadata:
           - AppVolumeDevice
           - AppVolumeMountPath
           - AppVolumeSize
+          - AppVolumeSnapshotId
           - AppVolumeType
       - Label:
           default: Network Configuration
@@ -189,7 +194,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 1.12.0
+  Version: 1.13.0
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -257,6 +262,14 @@ Parameters:
     MaxValue: 16384
     MinValue: 1
     Type: Number
+  AppVolumeSnapshotId:
+    AllowedPattern: '^$|snap-[a-z0-9]+'
+    Default: ''
+    Description: >-
+      (Optional) EBS Snapshot ID from which to create the AppVolume. "AppVolumeSize"
+      must be equal or greater than the size of the snapshot. Ignored if "AppVolumeDevice"
+      is false
+    Type: String
   AppVolumeType:
     AllowedValues:
       - gp2
@@ -761,6 +774,10 @@ Resources:
           - DeviceName: /dev/xvdf
             Ebs:
               DeleteOnTermination: true
+              SnapshotId: !If
+                - UseAppVolumeSnapshot
+                - !Ref AppVolumeSnapshotId
+                - !Ref 'AWS::NoValue'
               VolumeSize: !Ref AppVolumeSize
               VolumeType: !Ref AppVolumeType
           - !Ref 'AWS::NoValue'

diff --git a/modules/win-autoscale/main.tf b/modules/win-autoscale/main.tf
@@ -21,6 +21,7 @@ resource "aws_cloudformation_stack" "watchmaker-win-autoscale" {
     AppScriptUrl                = "${var.AppScriptUrl}"
     AppVolumeDevice             = "${var.AppVolumeDevice}"
     AppVolumeSize               = "${var.AppVolumeSize}"
+    AppVolumeSnapshotId         = "${var.AppVolumeSnapshotId}"
     AppVolumeType               = "${var.AppVolumeType}"
     AsgMetrics                  = "${join(",", var.AsgMetrics)}"
     AsgNotificationTypes        = "${join(",", var.AsgNotificationTypes)}"

diff --git a/modules/win-autoscale/variables.tf b/modules/win-autoscale/variables.tf
@@ -100,6 +100,12 @@ variable "AppVolumeSize" {
   default     = "1"
 }
 
+variable "AppVolumeSnapshotId" {
+  type        = "string"
+  description = "(Optional) EBS Snapshot ID from which to create the AppVolume. \"AppVolumeSize\" must be equal or greater than the size of the snapshot. Ignored if \"AppVolumeDevice\" is blank"
+  default     = ""
+}
+
 variable "KeyPairName" {
   type        = "string"
   description = "Public/private key pairs allow you to securely connect to your instance after it launches"

diff --git a/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml b/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml
@@ -47,6 +47,10 @@ Conditions:
     - !Equals
       - !Ref WatchmakerAdminGroups
       - ''
+  UseAppVolumeSnapshot: !Not
+    - !Equals
+      - !Ref AppVolumeSnapshotId
+      - ''
   UseCfnUrl: !Not
     - !Equals
       - !Ref CfnEndpointUrl
@@ -138,6 +142,7 @@ Metadata:
         Parameters:
           - AppVolumeDevice
           - AppVolumeSize
+          - AppVolumeSnapshotId
           - AppVolumeType
       - Label:
           default: AutoScale Configuration
@@ -171,7 +176,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 1.12.0
+  Version: 1.13.0
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -231,6 +236,14 @@ Parameters:
     MaxValue: 16384
     MinValue: 1
     Type: Number
+  AppVolumeSnapshotId:
+    AllowedPattern: '^$|snap-[a-z0-9]+'
+    Default: ''
+    Description: >-
+      (Optional) EBS Snapshot ID from which to create the AppVolume. "AppVolumeSize"
+      must be equal or greater than the size of the snapshot. Ignored if "AppVolumeDevice"
+      is blank
+    Type: String
   AppVolumeType:
     AllowedValues:
       - gp2
@@ -902,6 +915,10 @@ Resources:
           - DeviceName: !Ref AppVolumeDevice
             Ebs:
               DeleteOnTermination: true
+              SnapshotId: !If
+                - UseAppVolumeSnapshot
+                - !Ref AppVolumeSnapshotId
+                - !Ref 'AWS::NoValue'
               VolumeSize: !Ref AppVolumeSize
               VolumeType: !Ref AppVolumeType
           - !Ref 'AWS::NoValue'

diff --git a/modules/win-instance/main.tf b/modules/win-instance/main.tf
@@ -21,6 +21,7 @@ resource "aws_cloudformation_stack" "watchmaker-win-instance" {
     AppScriptUrl           = "${var.AppScriptUrl}"
     AppVolumeDevice        = "${var.AppVolumeDevice}"
     AppVolumeSize          = "${var.AppVolumeSize}"
+    AppVolumeSnapshotId    = "${var.AppVolumeSnapshotId}"
     AppVolumeType          = "${var.AppVolumeType}"
     CfnEndpointUrl         = "${var.CfnEndpointUrl}"
     CloudWatchAgentUrl     = "${var.CloudWatchAgentUrl}"

diff --git a/modules/win-instance/variables.tf b/modules/win-instance/variables.tf
@@ -108,6 +108,12 @@ variable "AppVolumeSize" {
   default     = "1"
 }
 
+variable "AppVolumeSnapshotId" {
+  type        = "string"
+  description = "(Optional) EBS Snapshot ID from which to create the AppVolume. \"AppVolumeSize\" must be equal or greater than the size of the snapshot. Ignored if \"AppVolumeDevice\" is blank"
+  default     = ""
+}
+
 variable "KeyPairName" {
   type        = "string"
   description = "Public/private key pairs allow you to securely connect to your instance after it launches"

diff --git a/modules/win-instance/watchmaker-win-instance.template.cfn.yaml b/modules/win-instance/watchmaker-win-instance.template.cfn.yaml
@@ -40,6 +40,10 @@ Conditions:
     - !Equals
       - !Ref WatchmakerAdminUsers
       - ''
+  UseAppVolumeSnapshot: !Not
+    - !Equals
+      - !Ref AppVolumeSnapshotId
+      - ''
   UseCfnUrl: !Not
     - !Equals
       - !Ref CfnEndpointUrl
@@ -109,6 +113,7 @@ Metadata:
         Parameters:
           - AppVolumeDevice
           - AppVolumeSize
+          - AppVolumeSnapshotId
           - AppVolumeType
       - Label:
           default: Network Configuration
@@ -125,7 +130,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 1.12.0
+  Version: 1.13.0
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -174,6 +179,14 @@ Parameters:
     MaxValue: 16384
     MinValue: 1
     Type: Number
+  AppVolumeSnapshotId:
+    AllowedPattern: '^$|snap-[a-z0-9]+'
+    Default: ''
+    Description: >-
+      (Optional) EBS Snapshot ID from which to create the AppVolume. "AppVolumeSize"
+      must be equal or greater than the size of the snapshot. Ignored if "AppVolumeDevice"
+      is blank
+    Type: String
   AppVolumeType:
     AllowedValues:
       - gp2
@@ -726,6 +739,10 @@ Resources:
           - DeviceName: !Ref AppVolumeDevice
             Ebs:
               DeleteOnTermination: true
+              SnapshotId: !If
+                - UseAppVolumeSnapshot
+                - !Ref AppVolumeSnapshotId
+                - !Ref 'AWS::NoValue'
               VolumeSize: !Ref AppVolumeSize
               VolumeType: !Ref AppVolumeType
           - !Ref 'AWS::NoValue'