cleanup

Author: michaelwittig

chapter11/multiaz-ebs.json

@@ -107,7 +107,6 @@
 		},
 		"InternetRoute": {
 			"Type": "AWS::EC2::Route",
-			"DependsOn": "GatewayToInternet",
 			"Properties": {
 				"RouteTableId": {
 					"Ref": "RouteTable"
@@ -116,7 +115,8 @@
 				"GatewayId": {
 					"Ref": "InternetGateway"
 				}
-			}
+			},
+			"DependsOn": "GatewayToInternet"
 		},
 		"RouteTableAssociationA": {
 			"Type": "AWS::EC2::SubnetRouteTableAssociation",

chapter11/multiaz.json

@@ -113,7 +113,6 @@
 		},
 		"InternetRoute": {
 			"Type": "AWS::EC2::Route",
-			"DependsOn": "GatewayToInternet",
 			"Properties": {
 				"RouteTableId": {
 					"Ref": "RouteTable"
@@ -122,7 +121,8 @@
 				"GatewayId": {
 					"Ref": "InternetGateway"
 				}
-			}
+			},
+			"DependsOn": "GatewayToInternet"
 		},
 		"RouteTableAssociationA": {
 			"Type": "AWS::EC2::SubnetRouteTableAssociation",

chapter11/recovery.json

@@ -97,7 +97,6 @@
 		},
 		"InternetRoute": {
 			"Type": "AWS::EC2::Route",
-			"DependsOn": "GatewayToInternet",
 			"Properties": {
 				"RouteTableId": {
 					"Ref": "RouteTable"
@@ -106,7 +105,8 @@
 				"GatewayId": {
 					"Ref": "InternetGateway"
 				}
-			}
+			},
+			"DependsOn": "GatewayToInternet"			
 		},
 		"RouteTableAssociation": {
 			"Type": "AWS::EC2::SubnetRouteTableAssociation",
@@ -300,11 +300,11 @@
 		},
 		"ElasticIP": {
 			"Type": "AWS::EC2::EIP",
-			"DependsOn": "GatewayToInternet",
 			"Properties": {
 				"InstanceId": {"Ref": "Server"},
 				"Domain": "vpc"
-			}
+			},
+			"DependsOn": "GatewayToInternet"
 		},
 		"Server": {
 			"Type": "AWS::EC2::Instance",
@@ -328,7 +328,8 @@
 						"Value": "jenkins-recovery"
 					}
 				]
-			}
+			},
+			"DependsOn": "GatewayToInternet"
 		},
 		"RecoveryAlarm": {
 			"Type": "AWS::CloudWatch::Alarm",

chapter5/vpn-cloudformation.json

@@ -60,7 +60,7 @@
 					"curl -s https://raw.githubusercontent.com/AWSinAction/code/master/chapter5/vpn-setup.sh | bash -ex\n"
 				]]}}
 			}
-    	},
+		},
 		"InstanceSecurityGroup": {
 			"Type": "AWS::EC2::SecurityGroup",
 			"Properties": {

chapter8/nfs.json

@@ -186,12 +186,12 @@
 					"/opt/aws/bin/cfn-signal -e $? --stack ", {"Ref": "AWS::StackName"}, " --resource Client1 --region ", {"Ref": "AWS::Region"}, "\n"
 				]]}}
 			},
-			"DependsOn": "WaitCondition",
 			"CreationPolicy": {
 				"ResourceSignal": {
 					"Timeout": "PT10M"
 				}
-			}
+			},
+			"DependsOn": "WaitCondition"
 		},
 		"Client2": {
 			"Type": "AWS::EC2::Instance",
@@ -210,12 +210,12 @@
 					"/opt/aws/bin/cfn-signal -e $? --stack ", {"Ref": "AWS::StackName"}, " --resource Client2 --region ", {"Ref": "AWS::Region"}, "\n"
 				]]}}
 			},
-			"DependsOn": "WaitCondition",
 			"CreationPolicy": {
 				"ResourceSignal": {
 					"Timeout": "PT10M"
 				}
-			}
+			},
+			"DependsOn": "WaitCondition"
 		}
 	},
 	"Outputs": {