Skip to content
This repository was archived by the owner on Oct 4, 2024. It is now read-only.

Commit 2be0511

Browse files
Exports everywhere! Plus revise outputs order and descriptions.
1 parent 321662b commit 2be0511

File tree

1 file changed

+122
-37
lines changed

1 file changed

+122
-37
lines changed

templates/aws-vpc.template

Lines changed: 122 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2311,37 +2311,62 @@
23112311
"Outputs": {
23122312
"NAT1EIP": {
23132313
"Condition": "PrivateSubnetsCondition",
2314-
"Description": "NAT Gateway 1 IP address",
2314+
"Description": "NAT 1 IP address",
23152315
"Value": {
23162316
"Ref": "NAT1EIP"
2317+
},
2318+
"Export": {
2319+
"Name": {
2320+
"Fn::Sub": "${AWS::StackName}-NAT1EIP"
2321+
}
23172322
}
23182323
},
23192324
"NAT2EIP": {
23202325
"Condition": "PrivateSubnetsCondition",
2321-
"Description": "NAT Gateway 2 IP address",
2326+
"Description": "NAT 2 IP address",
23222327
"Value": {
23232328
"Ref": "NAT2EIP"
2329+
},
2330+
"Export": {
2331+
"Name": {
2332+
"Fn::Sub": "${AWS::StackName}-NAT2EIP"
2333+
}
23242334
}
23252335
},
23262336
"NAT3EIP": {
23272337
"Condition": "PrivateSubnets&3AZCondition",
2328-
"Description": "NAT Gateway 3 IP address",
2338+
"Description": "NAT 3 IP address",
23292339
"Value": {
23302340
"Ref": "NAT3EIP"
2341+
},
2342+
"Export": {
2343+
"Name": {
2344+
"Fn::Sub": "${AWS::StackName}-NAT3EIP"
2345+
}
23312346
}
23322347
},
23332348
"NAT4EIP": {
23342349
"Condition": "PrivateSubnets&4AZCondition",
2335-
"Description": "NAT Gateway 4 IP address",
2350+
"Description": "NAT 4 IP address",
23362351
"Value": {
23372352
"Ref": "NAT4EIP"
2353+
},
2354+
"Export": {
2355+
"Name": {
2356+
"Fn::Sub": "${AWS::StackName}-NAT4EIP"
2357+
}
23382358
}
23392359
},
23402360
"PrivateSubnet1ACIDR": {
23412361
"Condition": "PrivateSubnetsCondition",
23422362
"Description": "Private subnet 1A CIDR in Availability Zone 1",
23432363
"Value": {
23442364
"Ref": "PrivateSubnet1ACIDR"
2365+
},
2366+
"Export": {
2367+
"Name": {
2368+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet1ACIDR"
2369+
}
23452370
}
23462371
},
23472372
"PrivateSubnet1AID": {
@@ -2361,6 +2386,11 @@
23612386
"Description": "Private subnet 1B CIDR in Availability Zone 1",
23622387
"Value": {
23632388
"Ref": "PrivateSubnet1BCIDR"
2389+
},
2390+
"Export": {
2391+
"Name": {
2392+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet1BCIDR"
2393+
}
23642394
}
23652395
},
23662396
"PrivateSubnet1BID": {
@@ -2380,6 +2410,11 @@
23802410
"Description": "Private subnet 2A CIDR in Availability Zone 2",
23812411
"Value": {
23822412
"Ref": "PrivateSubnet2ACIDR"
2413+
},
2414+
"Export": {
2415+
"Name": {
2416+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2ACIDR"
2417+
}
23832418
}
23842419
},
23852420
"PrivateSubnet2AID": {
@@ -2399,6 +2434,11 @@
23992434
"Description": "Private subnet 2B CIDR in Availability Zone 2",
24002435
"Value": {
24012436
"Ref": "PrivateSubnet2BCIDR"
2437+
},
2438+
"Export": {
2439+
"Name": {
2440+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2BCIDR"
2441+
}
24022442
}
24032443
},
24042444
"PrivateSubnet2BID": {
@@ -2418,6 +2458,11 @@
24182458
"Description": "Private subnet 3A CIDR in Availability Zone 3",
24192459
"Value": {
24202460
"Ref": "PrivateSubnet3ACIDR"
2461+
},
2462+
"Export": {
2463+
"Name": {
2464+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3ACIDR"
2465+
}
24212466
}
24222467
},
24232468
"PrivateSubnet3AID": {
@@ -2437,6 +2482,11 @@
24372482
"Description": "Private subnet 3B CIDR in Availability Zone 3",
24382483
"Value": {
24392484
"Ref": "PrivateSubnet3BCIDR"
2485+
},
2486+
"Export": {
2487+
"Name": {
2488+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3BCIDR"
2489+
}
24402490
}
24412491
},
24422492
"PrivateSubnet3BID": {
@@ -2456,6 +2506,11 @@
24562506
"Description": "Private subnet 4A CIDR in Availability Zone 4",
24572507
"Value": {
24582508
"Ref": "PrivateSubnet4ACIDR"
2509+
},
2510+
"Export": {
2511+
"Name": {
2512+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet4ACIDR"
2513+
}
24592514
}
24602515
},
24612516
"PrivateSubnet4AID": {
@@ -2475,6 +2530,11 @@
24752530
"Description": "Private subnet 4B CIDR in Availability Zone 4",
24762531
"Value": {
24772532
"Ref": "PrivateSubnet4BCIDR"
2533+
},
2534+
"Export": {
2535+
"Name": {
2536+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet4BCIDR"
2537+
}
24782538
}
24792539
},
24802540
"PrivateSubnet4BID": {
@@ -2493,6 +2553,11 @@
24932553
"Description": "Public subnet 1 CIDR in Availability Zone 1",
24942554
"Value": {
24952555
"Ref": "PublicSubnet1CIDR"
2556+
},
2557+
"Export": {
2558+
"Name": {
2559+
"Fn::Sub": "${AWS::StackName}-PublicSubnet1CIDR"
2560+
}
24962561
}
24972562
},
24982563
"PublicSubnet1ID": {
@@ -2510,6 +2575,11 @@
25102575
"Description": "Public subnet 2 CIDR in Availability Zone 2",
25112576
"Value": {
25122577
"Ref": "PublicSubnet2CIDR"
2578+
},
2579+
"Export": {
2580+
"Name": {
2581+
"Fn::Sub": "${AWS::StackName}-PublicSubnet2CIDR"
2582+
}
25132583
}
25142584
},
25152585
"PublicSubnet2ID": {
@@ -2528,6 +2598,11 @@
25282598
"Description": "Public subnet 3 CIDR in Availability Zone 3",
25292599
"Value": {
25302600
"Ref": "PublicSubnet3CIDR"
2601+
},
2602+
"Export": {
2603+
"Name": {
2604+
"Fn::Sub": "${AWS::StackName}-PublicSubnet3CIDR"
2605+
}
25312606
}
25322607
},
25332608
"PublicSubnet3ID": {
@@ -2547,6 +2622,11 @@
25472622
"Description": "Public subnet 4 CIDR in Availability Zone 4",
25482623
"Value": {
25492624
"Ref": "PublicSubnet4CIDR"
2625+
},
2626+
"Export": {
2627+
"Name": {
2628+
"Fn::Sub": "${AWS::StackName}-PublicSubnet4CIDR"
2629+
}
25502630
}
25512631
},
25522632
"PublicSubnet4ID": {
@@ -2566,87 +2646,92 @@
25662646
"Description": "S3 VPC Endpoint",
25672647
"Value": {
25682648
"Ref": "S3VPCEndpoint"
2649+
},
2650+
"Export": {
2651+
"Name": {
2652+
"Fn::Sub": "${AWS::StackName}-S3VPCEndpoint"
2653+
}
25692654
}
25702655
},
25712656
"PrivateSubnet1ARouteTable": {
25722657
"Value": {
25732658
"Ref": "PrivateSubnet1ARouteTable"
25742659
},
2575-
"Description": "Private subnet 1A Route Table",
2660+
"Description": "Private subnet 1A route table",
25762661
"Export": {
25772662
"Name": {
25782663
"Fn::Sub": "${AWS::StackName}-PrivateSubnet1ARouteTable"
25792664
}
25802665
}
25812666
},
2582-
"PrivateSubnet2ARouteTable": {
2667+
"PrivateSubnet1BRouteTable": {
2668+
"Condition": "AdditionalPrivateSubnetsCondition",
25832669
"Value": {
2584-
"Ref": "PrivateSubnet2ARouteTable"
2670+
"Ref": "PrivateSubnet1BRouteTable"
25852671
},
2586-
"Description": "Private subnet 2A Route Table",
2672+
"Description": "Private subnet 1B route table",
25872673
"Export": {
25882674
"Name": {
2589-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2ARouteTable"
2675+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet1BRouteTable"
25902676
}
25912677
}
25922678
},
2593-
"PrivateSubnet3ARouteTable": {
2594-
"Condition": "PrivateSubnets&3AZCondition",
2679+
"PrivateSubnet2ARouteTable": {
25952680
"Value": {
2596-
"Ref": "PrivateSubnet3ARouteTable"
2681+
"Ref": "PrivateSubnet2ARouteTable"
25972682
},
2598-
"Description": "Private subnet 3A Route Table",
2683+
"Description": "Private subnet 2A route table",
25992684
"Export": {
26002685
"Name": {
2601-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3ARouteTable"
2686+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2ARouteTable"
26022687
}
26032688
}
26042689
},
2605-
"PrivateSubnet4ARouteTable": {
2606-
"Condition": "PrivateSubnets&4AZCondition",
2690+
"PrivateSubnet2BRouteTable": {
2691+
"Condition": "AdditionalPrivateSubnetsCondition",
26072692
"Value": {
2608-
"Ref": "PrivateSubnet4ARouteTable"
2693+
"Ref": "PrivateSubnet2BRouteTable"
26092694
},
2610-
"Description": "Private subnet 4A Route Table",
2695+
"Description": "Private subnet 2B route table",
26112696
"Export": {
26122697
"Name": {
2613-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet4ARouteTable"
2698+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2BRouteTable"
26142699
}
26152700
}
26162701
},
2617-
"PrivateSubnet1BRouteTable": {
2618-
"Condition": "AdditionalPrivateSubnetsCondition",
2702+
"PrivateSubnet3ARouteTable": {
2703+
"Condition": "PrivateSubnets&3AZCondition",
26192704
"Value": {
2620-
"Ref": "PrivateSubnet1BRouteTable"
2705+
"Ref": "PrivateSubnet3ARouteTable"
26212706
},
2622-
"Description": "Private subnet 1B Route Table",
2707+
"Description": "Private subnet 3A route table",
26232708
"Export": {
26242709
"Name": {
2625-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet1BRouteTable"
2710+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3ARouteTable"
26262711
}
26272712
}
26282713
},
2629-
"PrivateSubnet2BRouteTable": {
2630-
"Condition": "AdditionalPrivateSubnetsCondition",
2714+
"PrivateSubnet3BRouteTable": {
2715+
"Condition": "AdditionalPrivateSubnets&3AZCondition",
26312716
"Value": {
2632-
"Ref": "PrivateSubnet2BRouteTable"
2717+
"Ref": "PrivateSubnet3BRouteTable"
26332718
},
2634-
"Description": "Private subnet 2B Route Table",
2719+
"Description": "Private subnet 3B route table",
26352720
"Export": {
26362721
"Name": {
2637-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet2BRouteTable"
2722+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3BRouteTable"
26382723
}
26392724
}
26402725
},
2641-
"PrivateSubnet3BRouteTable": {
2642-
"Condition": "AdditionalPrivateSubnets&3AZCondition",
2726+
"PrivateSubnet4ARouteTable": {
2727+
"Condition": "PrivateSubnets&4AZCondition",
26432728
"Value": {
2644-
"Ref": "PrivateSubnet3BRouteTable"
2729+
"Ref": "PrivateSubnet4ARouteTable"
26452730
},
2646-
"Description": "Private subnet 3B Route Table",
2731+
"Description": "Private subnet 4A route table",
26472732
"Export": {
26482733
"Name": {
2649-
"Fn::Sub": "${AWS::StackName}-PrivateSubnet3BRouteTable"
2734+
"Fn::Sub": "${AWS::StackName}-PrivateSubnet4ARouteTable"
26502735
}
26512736
}
26522737
},
@@ -2655,7 +2740,7 @@
26552740
"Value": {
26562741
"Ref": "PrivateSubnet4BRouteTable"
26572742
},
2658-
"Description": "Private subnet 4B Route Table",
2743+
"Description": "Private subnet 4B route table",
26592744
"Export": {
26602745
"Name": {
26612746
"Fn::Sub": "${AWS::StackName}-PrivateSubnet4BRouteTable"
@@ -2666,7 +2751,7 @@
26662751
"Value": {
26672752
"Ref": "PublicSubnetRouteTable"
26682753
},
2669-
"Description": "Public subnet Route Table",
2754+
"Description": "Public subnet route table",
26702755
"Export": {
26712756
"Name": {
26722757
"Fn::Sub": "${AWS::StackName}-PublicSubnetRouteTable"
@@ -2696,4 +2781,4 @@
26962781
}
26972782
}
26982783
}
2699-
}
2784+
}

0 commit comments

Comments
 (0)