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

Commit f38adc3

Browse files
Merge pull request #12 from aws-quickstart/feature/vpc-tenancy
Feature/vpc tenancy
2 parents 9f136d4 + ed7250b commit f38adc3

12 files changed

+153
-14
lines changed

ci/aws-vpc-3az-complete.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_3]"
4+
"ParameterValue": "$[alfred_getaz_3]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-3az-public.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_3]"
4+
"ParameterValue": "$[alfred_getaz_3]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-3az.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_3]"
4+
"ParameterValue": "$[alfred_getaz_3]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-4az-complete.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_4]"
4+
"ParameterValue": "$[alfred_getaz_4]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-4az-public.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_4]"
4+
"ParameterValue": "$[alfred_getaz_4]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-4az.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_4]"
4+
"ParameterValue": "$[alfred_getaz_4]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-complete.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_2]"
4+
"ParameterValue": "$[alfred_getaz_2]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-dedicated.json

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
[
2+
{
3+
"ParameterKey": "AvailabilityZones",
4+
"ParameterValue": "$[alfred_getaz_2]"
5+
},
6+
{
7+
"ParameterKey": "CreateAdditionalPrivateSubnets",
8+
"ParameterValue": "false"
9+
},
10+
{
11+
"ParameterKey": "CreatePrivateSubnets",
12+
"ParameterValue": "false"
13+
},
14+
{
15+
"ParameterKey": "KeyPairName",
16+
"ParameterValue": "$[alfred_getkeypair]"
17+
},
18+
{
19+
"ParameterKey": "NATInstanceType",
20+
"ParameterValue": "t2.small"
21+
},
22+
{
23+
"ParameterKey": "NumberOfAZs",
24+
"ParameterValue": "2"
25+
},
26+
{
27+
"ParameterKey": "PrivateSubnet1ACIDR",
28+
"ParameterValue": "10.0.0.0/19"
29+
},
30+
{
31+
"ParameterKey": "PrivateSubnet1BCIDR",
32+
"ParameterValue": "10.0.192.0/21"
33+
},
34+
{
35+
"ParameterKey": "PrivateSubnet2ACIDR",
36+
"ParameterValue": "10.0.32.0/19"
37+
},
38+
{
39+
"ParameterKey": "PrivateSubnet2BCIDR",
40+
"ParameterValue": "10.0.200.0/21"
41+
},
42+
{
43+
"ParameterKey": "PrivateSubnet3ACIDR",
44+
"ParameterValue": "10.0.64.0/19"
45+
},
46+
{
47+
"ParameterKey": "PrivateSubnet3BCIDR",
48+
"ParameterValue": "10.0.208.0/21"
49+
},
50+
{
51+
"ParameterKey": "PrivateSubnet4ACIDR",
52+
"ParameterValue": "10.0.96.0/19"
53+
},
54+
{
55+
"ParameterKey": "PrivateSubnet4BCIDR",
56+
"ParameterValue": "10.0.216.0/21"
57+
},
58+
{
59+
"ParameterKey": "PublicSubnet1CIDR",
60+
"ParameterValue": "10.0.128.0/20"
61+
},
62+
{
63+
"ParameterKey": "PublicSubnet2CIDR",
64+
"ParameterValue": "10.0.144.0/20"
65+
},
66+
{
67+
"ParameterKey": "PublicSubnet3CIDR",
68+
"ParameterValue": "10.0.160.0/20"
69+
},
70+
{
71+
"ParameterKey": "PublicSubnet4CIDR",
72+
"ParameterValue": "10.0.176.0/20"
73+
},
74+
{
75+
"ParameterKey": "VPCCIDR",
76+
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "dedicated"
81+
}
82+
]

ci/aws-vpc-defaults.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_2]"
4+
"ParameterValue": "$[alfred_getaz_2]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

ci/aws-vpc-public.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"ParameterKey": "AvailabilityZones",
4-
"ParameterValue": "$[alfred_genaz_2]"
4+
"ParameterValue": "$[alfred_getaz_2]"
55
},
66
{
77
"ParameterKey": "CreateAdditionalPrivateSubnets",
@@ -74,5 +74,9 @@
7474
{
7575
"ParameterKey": "VPCCIDR",
7676
"ParameterValue": "10.0.0.0/16"
77+
},
78+
{
79+
"ParameterKey": "VPCTenancy",
80+
"ParameterValue": "default"
7781
}
7882
]

0 commit comments

Comments
 (0)