Merge pull request #5 from trend-scottb/develop

Updated the templates for Deep Security 10.0

Author: santiagocardenas

templates/Common/DB/DSDBAbstract.template

@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion" : "2010-09-09",
-    "Description"              : "v2016-01-08: This template is an abstraction layer for choosing Oracle or MSSQL when deploying Deep Security Manager",
+    "Description"              : "v5.0: This template is an abstraction layer for choosing Oracle or MSSQL when deploying Deep Security Manager",
     "Parameters"               : {
         "DBIRDSInstanceSize" : {
             "Default" : "db.m3.large",
@@ -98,10 +98,6 @@
 				],
 			"Default" : "false"
 			},
-		"DBIInstanceIdentifier" : {
-			"Description" : "Choose RDS Instance ID",
-			"Type" : "String"
-			},
 		"DBISubnetGroupName" : {
 			"Type" : "String",
 			"Default" : ""
@@ -118,7 +114,7 @@
         },
 		"CfnUrlPrefix" : {
 			"Type" : "String",
-			"Default" : "https://s3.amazonaws.com/trend-micro-quick-start/v3.7/"
+			"Default" : "https://s3.amazonaws.com/quickstart-reference/trendmicro/deepsecurity/latest/templates"
 		}
     },
     "Resources"                : {
@@ -158,7 +154,6 @@
                     "RDSSG"               : {
                         "Ref" : "RDSSG"
                     },
-					"DBIInstanceIdentifier" : { "Ref" : "DBIInstanceIdentifier" },
 					"DBISubnetGroupName" : { "Ref" : "DBISubnetGroup" },
                     "MultiAZ" : { "Ref" : "MultiAZ" }
                 }
@@ -200,7 +195,6 @@
                     "RDSSG"               : {
                         "Ref" : "RDSSG"
                     },
-					"DBIInstanceIdentifier" : { "Ref" : "DBIInstanceIdentifier" },
 					"DBISubnetGroupName" : { "Ref" : "DBISubnetGroup" },
                     "MultiAZ" : { "Ref" : "MultiAZ" }
                 }

templates/Common/DB/DSDBOracleRDS.template

@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion" : "2010-09-09",
-    "Description"              : "v2016-01-08: This template deploys an Oracle RDS instance for Deep Security Manager",
+    "Description"              : "v5.0: This template deploys an Oracle RDS instance for Deep Security Manager",
     "Parameters"               : {
         "DBIRDSInstanceSize" : {
             "Default" : "db.m3.large",
@@ -85,10 +85,6 @@
         "RDSSG"               : {
             "Type" : "AWS::EC2::SecurityGroup::Id"
         },
-		"DBIInstanceIdentifier" : {
-			"Description" : "Choose RDS Instance ID",
-			"Type" : "String"
-			},
 		"DBISubnetGroupName" : {
 			"Type" : "String"
 			},
@@ -117,7 +113,13 @@
                 "DBInstanceClass"  : {
                     "Ref" : "DBIRDSInstanceSize"
                 },
-                "Engine"           : "oracle-se1",
+                "Engine"           : {
+                    "Fn::If" : [
+                        "RegionIsUsGovCloud",
+                        "oracle-se1",
+                        "oracle-se2"
+                    ]
+                },
                 "MasterUsername"   : {
                     "Ref" : "DBICAdminName"
                 },
@@ -131,12 +133,31 @@
                 "BackupRetentionPeriod" : {
                     "Ref" : "DBPBackupDays"
                 },
-                "DBInstanceIdentifier"  : { "Ref" : "DBIInstanceIdentifier" },
 				"DBSubnetGroupName" : { "Ref" : "DBISubnetGroupName" },
-                "StorageType" : { "Ref" : "StorageType" }
+                "StorageType" : { "Ref" : "StorageType" },
+                "Tags"               : [
+                    {
+                        "Key" : "Application",
+                        "Value" : "Deep Security Manager"
+                    }
+                ]
             }
         }
     },
+    "Conditions" : {
+        "RegionIsUsGovCloud" : {
+            "Fn::Equals" : [
+                { "Ref" : "AWS::Region" },
+                "us-gov-west-1"
+            ]
+        },
+        "MultiAZ" : {
+            "Fn::Equals" : [
+                { "Ref": "MultiAZ" },
+                "true"
+            ]
+        }
+    },
     "Outputs"                  : {
         "DSDBEndpoint" : {
             "Description" : "Endpoint to be passed to DSM installation properties file",