fix gc vs commercial Fn::If order

424D57 · 424D57 · commit 3ef1f13e4580 · 2016-05-12T08:45:14.000-05:00
diff --git a/DeepSecurity/Quickstart/TMQuickStartRHEL.template b/DeepSecurity/Quickstart/TMQuickStartRHEL.template
@@ -273,8 +273,8 @@
 							{
 								"Fn::If" : [
 									"RegionIsUsGovWest1",
-									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] },
-									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] }
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] },
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] }
 								]
 							},
 							"RHEL/MasterRH96.template"
@@ -364,8 +364,8 @@
 					"CfnUrlPrefix" : {
 								"Fn::If" : [
 									"RegionIsUsGovWest1",
-									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] },
-									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] }
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] },
+									{ "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] }
 								]
 							}
                 }
diff --git a/DeepSecurity/RHEL/DSM96RH.template b/DeepSecurity/RHEL/DSM96RH.template
@@ -810,8 +810,8 @@
 											{
 												"Fn::If" : [
 													"RegionIsUsGovWest1",
-													"Common/Scripts/createCloudAccount",
-													"Common/Scripts/createCloudAccountGc"
+													"Common/Scripts/createCloudAccountGc",
+													"Common/Scripts/createCloudAccount"
 												]
 											}
 										]

Original file line number	Diff line number	Diff line change
`@@ -273,8 +273,8 @@`
`273`	`273`	`{`
`274`	`274`	`"Fn::If" : [`
`275`	`275`	`"RegionIsUsGovWest1",`
`276`		`- { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] },`
`277`		`- { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] }`
	`276`	`+ { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] },`
	`277`	`+ { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] }`
`278`	`278`	`]`
`279`	`279`	`},`
`280`	`280`	`"RHEL/MasterRH96.template"`
`@@ -364,8 +364,8 @@`
`364`	`364`	`"CfnUrlPrefix" : {`
`365`	`365`	`"Fn::If" : [`
`366`	`366`	`"RegionIsUsGovWest1",`
`367`		`- { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] },`
`368`		`- { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] }`
	`367`	`+ { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "GovCloudPrefix" ] },`
	`368`	`+ { "Fn::FindInMap" : [ "Parameters", "CfnUrlPrefix", "CommericalPrefix" ] }`
`369`	`369`	`]`
`370`	`370`	`}`
`371`	`371`	`}`
Original file line number	Diff line number	Diff line change
`@@ -810,8 +810,8 @@`
`810`	`810`	`{`
`811`	`811`	`"Fn::If" : [`
`812`	`812`	`"RegionIsUsGovWest1",`
`813`		`- "Common/Scripts/createCloudAccount",`
`814`		`- "Common/Scripts/createCloudAccountGc"`
	`813`	`+ "Common/Scripts/createCloudAccountGc",`
	`814`	`+ "Common/Scripts/createCloudAccount"`
`815`	`815`	`]`
`816`	`816`	`}`
`817`	`817`	`]`