Merge branch 'master' into NIST

Author: 424D57

DeepSecurity/Quickstart/TMQuickStart.template

@@ -342,7 +342,8 @@
                     },
 					"DBIInstanceIdentifier" : "deep-security",
 					"DSIPLicense"         : "PerHost",
-					"DBPMultiAZ": "true"
+					"DBPMultiAZ": "true",
+					"CfnUrlPrefix" : { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "Prefix" ] }
                 }
             }
         }

DeepSecurity/Quickstart/TMQuickStartBYOL.template

@@ -341,7 +341,8 @@
 							{	"Ref" : "AWS::Region" },
 							{	"Ref" : "DatabaseEngine" }
 						]		
-					}
+					},
+					"CfnUrlPrefix" : { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "Prefix" ] }
                 }
             }
         }

DeepSecurity/Quickstart/TMQuickStartPPU.template

@@ -311,7 +311,8 @@
 								"Size"
 						]						
                     },
-					"DBPMultiAZ": "true"
+					"DBPMultiAZ": "true",
+					"CfnUrlPrefix" : { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "Prefix" ] }
                 }
             }
         }

DeepSecurity/Quickstart/TMQuickStartPoc.template

@@ -247,7 +247,8 @@
                     },
 					"DBIInstanceIdentifier" : "deep-security",
 					"DSIPLicense"         : "MMS",
-					"DBPMultiAZ": "true"
+					"DBPMultiAZ": "true",
+					"CfnUrlPrefix" : { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "Prefix" ] }
                 }
             }
         }

DeepSecurity/Quickstart/TMQuickStartRHEL.template

@@ -360,7 +360,14 @@
                         "Ref" : "DatabaseSubnet2"
                     },
 					"DBIInstanceIdentifier" : "deep-security",
-					"DBPMultiAZ": "true"
+					"DBPMultiAZ": "true",
+					"CfnUrlPrefix" : {
+								"Fn::If" : [
+									"RegionIsUsGovWest1",
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] },
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] }
+								]
+							}
                 }
             }
         }