[Bug Fix] vpc/vpc-*azs - Fix gateway attachment race condition for new IPv6 routes (widdix#471)

Author: michaelwittig

vpc/vpc-2azs.yaml

@@ -175,6 +175,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicAInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTablePublic
       DestinationIpv6CidrBlock: '::/0'
@@ -194,6 +195,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicBInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableBPublic
       DestinationIpv6CidrBlock: '::/0'

vpc/vpc-3azs.yaml

@@ -228,6 +228,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicAInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTablePublic
       DestinationIpv6CidrBlock: '::/0'
@@ -247,6 +248,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicBInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableBPublic
       DestinationIpv6CidrBlock: '::/0'
@@ -266,6 +268,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicCInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableCPublic
       DestinationIpv6CidrBlock: '::/0'

vpc/vpc-4azs.yaml

@@ -281,6 +281,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicAInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTablePublic
       DestinationIpv6CidrBlock: '::/0'
@@ -300,6 +301,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicBInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableBPublic
       DestinationIpv6CidrBlock: '::/0'
@@ -319,6 +321,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicCInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableCPublic
       DestinationIpv6CidrBlock: '::/0'
@@ -338,6 +341,7 @@ Resources:
       GatewayId: !Ref InternetGateway
   RouteTablePublicDInternetRouteIPv6:
     Type: 'AWS::EC2::Route'
+    DependsOn: VPCGatewayAttachment
     Properties:
       RouteTableId: !Ref RouteTableDPublic
       DestinationIpv6CidrBlock: '::/0'