Merge pull request #10 from trend-scottb/feature/new-version

Fixed syntax error, added GovCloud mapping

Author: santiagocardenas

templates/marketplace/dsm-mp.template

@@ -251,6 +251,8 @@ Mappings:
     sa-east-1:
       PerHost: ami-1f275373
       BYOL: ami-3d057151
+    us-gov-west-1:
+      BYOL: ami-f5de5e94
   DSMSIZE:
     us-east-1:
       PerHost: m4.xlarge
@@ -294,6 +296,9 @@ Mappings:
     sa-east-1:
       PerHost: m4.xlarge
       BYOL: m4.xlarge
+    us-gov-west-1:
+      PerHost: m4.xlarge
+      BYOL: m4.xlarge
   DSMDBMap:
     SQL:
       DbTypeString: Microsoft SQL Server
@@ -326,8 +331,9 @@ Resources:
         PolicyDocument:
           Version: 2012-10-17
           Statement:
-          - Action:
-            - s3:GetObject
+          - Effect: Allow
+            Action:
+              - s3:GetObject
             Resource:
               Fn::Sub:
               - arn:${Partition}:s3:::${QSS3BucketName}/${QSS3KeyPrefix}*

templates/quickstart/trendmicro-deepsecurity-byol-master.template

@@ -205,6 +205,8 @@ Mappings:
       BYOL: m4.xlarge
     sa-east-1:
       BYOL: m4.xlarge
+    us-gov-west-1:
+      BYOL: m4.xlarge
   RDSInstanceSize:
     us-east-1:
       Oracle: db.m4.xlarge
@@ -262,6 +264,10 @@ Mappings:
       Oracle: db.m3.xlarge
       MSSQL: db.m3.xlarge
       PostgreSQL: db.m3.xlarge
+    us-gov-west-1:
+      Oracle: db.m3.xlarge
+      MSSQL: db.m3.xlarge
+      PostgreSQL: db.m3.xlarge
   RDSMultiAZ:
     us-east-1:
       Oracle: 'true'
@@ -319,6 +325,10 @@ Mappings:
       Oracle: 'true'
       MSSQL: 'false'
       PostgreSQL: 'true'
+    us-gov-west-1:
+      Oracle: 'true'
+      MSSQL: 'false'
+      PostgreSQL: 'true'
 Resources:
   MasterMP:
     Type: AWS::CloudFormation::Stack