Merge branch 'develop'

tonynv · tonynv · commit 7a0c5f9dacef · 2019-01-31T08:57:32.000-08:00
diff --git a/ci/taskcat.yml b/ci/taskcat.yml
@@ -5,6 +5,21 @@ global:
   qsname: quickstart-trendmicro-deepsecurity
   regions:
     - us-east-1
+    - us-east-2
+    - us-west-1
+    - us-west-2
+    - ca-central-1
+    - ap-south-1
+    - ap-northeast-2
+    - ap-southeast-1
+    - ap-southeast-2
+    - ap-northeast-1
+    - eu-central-1
+    - eu-west-1
+    - eu-west-2
+    - sa-east-1
+    - eu-west-3
+    - us-gov-west-1
   reporting: true
 tests:
   test-deepsec:
diff --git a/submodules/quickstart-aws-vpc b/submodules/quickstart-aws-vpc
@@ -1 +1 @@
-Subproject commit eafb0480e3f081c0b2dbadba5c76c28e64967467
+Subproject commit ac8786cff8fd030798dc26d6c9566ef730536bd4
diff --git a/templates/common/db/ds-db-abstract.template b/templates/common/db/ds-db-abstract.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template is an abstraction layer for choosing PostgreSQL,
+Description: 'v5.18: This template is an abstraction layer for choosing PostgreSQL,
   Oracle or MSSQL when deploying Deep Security Manager. (qs-1ngr590i4)'
 Parameters:
   DBIRDSInstanceSize:
diff --git a/templates/common/db/ds-db-mssql-rds.template b/templates/common/db/ds-db-mssql-rds.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template deploys an MSSQL RDS Instance for Deep Security
+Description: 'v5.18: This template deploys an MSSQL RDS Instance for Deep Security
   Manager. (qs-1ngr590ij)'
 Parameters:
   DBIRDSInstanceSize:
diff --git a/templates/common/db/ds-db-oracle-rds.template b/templates/common/db/ds-db-oracle-rds.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template deploys an Oracle RDS instance for Deep Security
+Description: 'v5.18: This template deploys an Oracle RDS instance for Deep Security
   Manager. (qs-1ngr590i9)'
 Parameters:
   DBIRDSInstanceSize:
diff --git a/templates/common/db/ds-db-postgresql-rds.template b/templates/common/db/ds-db-postgresql-rds.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template deploys a PostgreSQL RDS instance for Deep Security
+Description: 'v5.18: This template deploys a PostgreSQL RDS instance for Deep Security
   Manager. (qs-1ngr590ie)'
 Parameters:
   DBIRDSInstanceSize:
diff --git a/templates/common/dsm-elb.template b/templates/common/dsm-elb.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: Deploys Elastic Load Balancers and Security Groups for Deep Security
+Description: 'v5.18: Deploys Elastic Load Balancers and Security Groups for Deep Security
   (qs-1ngr590je). Manager.'
 Parameters:
   AWSIVPC:
diff --git a/templates/common/security-groups/ds-elb-sg.template b/templates/common/security-groups/ds-elb-sg.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template creates security groups for the ELB for Deep Security
+Description: 'v5.18: This template creates security groups for the ELB for Deep Security
   Manager. (qs-1ngr590io)'
 Parameters:
   AWSIVPC:
diff --git a/templates/common/security-groups/dsm-security-group.template b/templates/common/security-groups/dsm-security-group.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template creates the security group to allow inbound communication
+Description: 'v5.18: This template creates the security group to allow inbound communication
   to Deep Security Manager. (qs-1ngr590iu)'
 Parameters:
   AWSIVPC:
diff --git a/templates/common/security-groups/dsm-sg-ingress-rules.template b/templates/common/security-groups/dsm-sg-ingress-rules.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template creates the ingress rules for Deep Security Managers.
+Description: 'v5.18: This template creates the ingress rules for Deep Security Managers.
   (qs-1ngr590j4)'
 Parameters:
   DSMSG:
diff --git a/templates/common/security-groups/rds-security-group.template b/templates/common/security-groups/rds-security-group.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: This template creates the security group to allow communication
+Description: 'v5.18: This template creates the security group to allow communication
   from Deep Security Managers to their RDS Instance. (qs-1ngr590j9)'
 Parameters:
   AWSIVPC:
diff --git a/templates/marketplace/dsm-mp.template b/templates/marketplace/dsm-mp.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: Deploys Deep Security Manager to AWS. This template is designed
+Description: 'v5.18: Deploys Deep Security Manager to AWS. This template is designed
   to be nested in a stack, and requires several passed parameters to launch. **WARNING**
   This template creates Amazon EC2 instances and related resources. You will be billed
   for the AWS resources used if you create a stack from this template. (qs-1ngr590jo)'
@@ -215,53 +215,53 @@ Parameters:
 Mappings:
   DSMAMI:
     ap-northeast-1:
-      PerHost: ami-0ecec4b3de420bc3b
-      BYOL: ami-0a1e1f136e407693c
+      PerHost: ami-0379cadcc4020a755
+      BYOL: ami-08495528ca4dd913c
     ap-northeast-2:
-      PerHost: ami-0d1c9fe648b6dc701
-      BYOL: ami-0db757710ee8dc997
+      PerHost: ami-01e684a80d8d25a34
+      BYOL: ami-0861bc167cf69cd3f
     ap-south-1:
-      PerHost: ami-0fce14da2a73c2e44
-      BYOL: ami-07cbdc0d04f48d2e8
+      PerHost: ami-0310bbd01057491a9
+      BYOL: ami-0ef930026e3327313
     ap-southeast-1:
-      PerHost: ami-092c893dcc5c670dd
-      BYOL: ami-0a0ab48d0a0031849
+      PerHost: ami-0e059df7e5a4fa780
+      BYOL: ami-09f7b245b40a68e43
     ap-southeast-2:
-      PerHost: ami-00dd4d6303426850c
-      BYOL: ami-0f023de0a6ed31b48
+      PerHost: ami-0ae6d033f6f842eb6
+      BYOL: ami-0da923f3d1e3ee624
     ca-central-1:
-      PerHost: ami-0ffbe979d46808fab
-      BYOL: ami-0e870d970495dd352
+      PerHost: ami-0304538deb76da7dd
+      BYOL: ami-0b8b7c56d3d01ad0e
     eu-central-1:
-      PerHost: ami-0c865a33494762550
-      BYOL: ami-0983dbbc0e100c938
+      PerHost: ami-0257dda01ea3266c1
+      BYOL: ami-020fe3c993f7360d5
     eu-west-1:
-      PerHost: ami-0de24ff957e889844
-      BYOL: ami-09cc0afdc6254b801
+      PerHost: ami-086a7f436c346c1ea
+      BYOL: ami-0b4ec49bd7ec09e20
     eu-west-2:
-      PerHost: ami-06aaebf53274630e3
-      BYOL: ami-0945c4628dc4fad5b
+      PerHost: ami-057444042095d9827
+      BYOL: ami-04097d43d0d62dff5
     eu-west-3:
-      PerHost: ami-00883836d2894a9d3
-      BYOL: ami-0d29be9916dd0d8f4
+      PerHost: ami-03111690ab40937b9
+      BYOL: ami-0b41346a8c7281fcf
     sa-east-1:
-      PerHost: ami-0fca3605d7ae93f5e
-      BYOL: ami-0285639bc29b63cb4
+      PerHost: ami-00ddf20b9cfe647de
+      BYOL: ami-04112fabf1158c10b
     us-east-1:
-      PerHost: ami-0dd1ad16aa9e8cfa8
-      BYOL: ami-0efe65962a50771ba
+      PerHost: ami-0ecd04d3f4ade6df1
+      BYOL: ami-080c8a3073759ce1b
     us-east-2:
-      PerHost: ami-0e53dca56253c120d
-      BYOL: ami-0b1d4c1872170b148
+      PerHost: ami-0fbee806719e7918f
+      BYOL: ami-00fd2bdaba3211bb5
     us-gov-west-1:
-      PerHost: ami-c7cd57a6
-      BYOL: ami-7fc3591e
+      PerHost: ami-e9cdaf88
+      BYOL: ami-f3d2b092
     us-west-1:
-      PerHost: ami-0746680ef0f8ca91e
-      BYOL: ami-0bd282317b019b3be
+      PerHost: ami-0f00c6edbb8d67f60
+      BYOL: ami-0fcfc8c230724b093
     us-west-2:
-      PerHost: ami-0514be15681f83ede
-      BYOL: ami-0e6e7d7edacbff83a
+      PerHost: ami-0bbdbaaaa7a285704
+      BYOL: ami-0f5ba863007459030
   DSMSIZE:
     us-east-1:
       PerHost: m5.xlarge
diff --git a/templates/marketplace/master-mp.template b/templates/marketplace/master-mp.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'v5.17: Trend Micro Deep Security Marketplace master template. For more
+Description: 'v5.18: Trend Micro Deep Security Marketplace master template. For more
   information see http://aws.trendmicro.com. (qs-1ngr590jt)'
 Metadata:
   AWS::CloudFormation::Interface:
diff --git a/templates/quickstart/trendmicro-deepsecurity-byol-master.template b/templates/quickstart/trendmicro-deepsecurity-byol-master.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'QS(0011) - v5.17: Quick Start that deploys Trend Micro Deep Security
+Description: 'QS(0011) - v5.18: Quick Start that deploys Trend Micro Deep Security
   into an existing VPC with a Multi-AZ RDS instance  **WARNING** This template uses
   images from the AWS Marketplace and an active subscription is required - Please
   see the Quick Start documentation for more details. You will be billed for the AWS
diff --git a/templates/quickstart/trendmicro-deepsecurity-master.template b/templates/quickstart/trendmicro-deepsecurity-master.template
@@ -1,6 +1,6 @@
 ---
 AWSTemplateFormatVersion: 2010-09-09
-Description: 'QS(0011) - v5.17: Quick Start that deploys Trend Micro Deep Security
+Description: 'QS(0011) - v5.18: Quick Start that deploys Trend Micro Deep Security
   into an existing VPC with a Multi-AZ PostgreSQL RDS instance  **WARNING** This template
   uses images from the AWS Marketplace and an active subscription is required - Please
   see the Quick Start documentation for more details. You will be billed for the AWS
