Skip to content

Commit 07258db

Browse files
ericzbeardericzbeard
authored
Merge pull request #471 from zechariahks/issue_os_zech
Updated SecurityGroupIds property and update ubuntu22 to use SSM parameter for AMI ID
2 parents 59b0f01 + a19d931 commit 07258db

File tree

6 files changed

+53
-475
lines changed

6 files changed

+53
-475
lines changed

‎Solutions/OperatingSystems/RHEL9_cfn-hup.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,12 @@
337337
"SubnetId": {
338338
"Ref": "SubnetId"
339339
},
340-
"SecurityGroups": [
340+
"SecurityGroupIds": [
341341
{
342-
"Ref": "InstanceSecurityGroup"
342+
"Fn::GetAtt": [
343+
"InstanceSecurityGroup",
344+
"GroupId"
345+
]
343346
}
344347
],
345348
"KeyName": {

‎Solutions/OperatingSystems/RHEL9_cfn-hup.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ Resources:
264264
Properties:
265265
InstanceType: !Ref InstanceType
266266
SubnetId: !Ref SubnetId
267-
SecurityGroups:
268-
- !Ref InstanceSecurityGroup
267+
SecurityGroupIds:
268+
- !GetAtt InstanceSecurityGroup.GroupId
269269
KeyName: !Ref KeyName
270270
ImageId: !FindInMap
271271
- AWSRegionArch2AMI

‎Solutions/OperatingSystems/Ubuntu22.04_cfn-hup.json

Lines changed: 10 additions & 223 deletions
Original file line numberDiff line numberDiff line change
@@ -75,213 +75,11 @@
7575
},
7676
"SubnetId": {
7777
"Type": "AWS::EC2::Subnet::Id"
78-
}
79-
},
80-
"Mappings": {
81-
"AWSInstanceType2Arch": {
82-
"t1.micro": {
83-
"Arch": "HVM64"
84-
},
85-
"t2.nano": {
86-
"Arch": "HVM64"
87-
},
88-
"t2.micro": {
89-
"Arch": "HVM64"
90-
},
91-
"t2.small": {
92-
"Arch": "HVM64"
93-
},
94-
"t2.medium": {
95-
"Arch": "HVM64"
96-
},
97-
"t2.large": {
98-
"Arch": "HVM64"
99-
},
100-
"m1.small": {
101-
"Arch": "HVM64"
102-
},
103-
"m1.medium": {
104-
"Arch": "HVM64"
105-
},
106-
"m1.large": {
107-
"Arch": "HVM64"
108-
},
109-
"m1.xlarge": {
110-
"Arch": "HVM64"
111-
},
112-
"m2.xlarge": {
113-
"Arch": "HVM64"
114-
},
115-
"m2.2xlarge": {
116-
"Arch": "HVM64"
117-
},
118-
"m2.4xlarge": {
119-
"Arch": "HVM64"
120-
},
121-
"m3.medium": {
122-
"Arch": "HVM64"
123-
},
124-
"m3.large": {
125-
"Arch": "HVM64"
126-
},
127-
"m3.xlarge": {
128-
"Arch": "HVM64"
129-
},
130-
"m3.2xlarge": {
131-
"Arch": "HVM64"
132-
},
133-
"m4.large": {
134-
"Arch": "HVM64"
135-
},
136-
"m4.xlarge": {
137-
"Arch": "HVM64"
138-
},
139-
"m4.2xlarge": {
140-
"Arch": "HVM64"
141-
},
142-
"m4.4xlarge": {
143-
"Arch": "HVM64"
144-
},
145-
"m4.10xlarge": {
146-
"Arch": "HVM64"
147-
},
148-
"c1.medium": {
149-
"Arch": "HVM64"
150-
},
151-
"c1.xlarge": {
152-
"Arch": "HVM64"
153-
},
154-
"c3.large": {
155-
"Arch": "HVM64"
156-
},
157-
"c3.xlarge": {
158-
"Arch": "HVM64"
159-
},
160-
"c3.2xlarge": {
161-
"Arch": "HVM64"
162-
},
163-
"c3.4xlarge": {
164-
"Arch": "HVM64"
165-
},
166-
"c3.8xlarge": {
167-
"Arch": "HVM64"
168-
},
169-
"c4.large": {
170-
"Arch": "HVM64"
171-
},
172-
"c4.xlarge": {
173-
"Arch": "HVM64"
174-
},
175-
"c4.2xlarge": {
176-
"Arch": "HVM64"
177-
},
178-
"c4.4xlarge": {
179-
"Arch": "HVM64"
180-
},
181-
"c4.8xlarge": {
182-
"Arch": "HVM64"
183-
},
184-
"r3.large": {
185-
"Arch": "HVM64"
186-
},
187-
"r3.xlarge": {
188-
"Arch": "HVM64"
189-
},
190-
"r3.2xlarge": {
191-
"Arch": "HVM64"
192-
},
193-
"r3.4xlarge": {
194-
"Arch": "HVM64"
195-
},
196-
"r3.8xlarge": {
197-
"Arch": "HVM64"
198-
},
199-
"i2.xlarge": {
200-
"Arch": "HVM64"
201-
},
202-
"i2.2xlarge": {
203-
"Arch": "HVM64"
204-
},
205-
"i2.4xlarge": {
206-
"Arch": "HVM64"
207-
},
208-
"i2.8xlarge": {
209-
"Arch": "HVM64"
210-
},
211-
"d2.xlarge": {
212-
"Arch": "HVM64"
213-
},
214-
"d2.2xlarge": {
215-
"Arch": "HVM64"
216-
},
217-
"d2.4xlarge": {
218-
"Arch": "HVM64"
219-
},
220-
"d2.8xlarge": {
221-
"Arch": "HVM64"
222-
},
223-
"hi1.4xlarge": {
224-
"Arch": "HVM64"
225-
},
226-
"hs1.8xlarge": {
227-
"Arch": "HVM64"
228-
},
229-
"cr1.8xlarge": {
230-
"Arch": "HVM64"
231-
},
232-
"cc2.8xlarge": {
233-
"Arch": "HVM64"
234-
}
23578
},
236-
"AWSRegionArch2AMI": {
237-
"us-east-1": {
238-
"HVM64": "ami-08c40ec9ead489470"
239-
},
240-
"us-west-2": {
241-
"HVM64": "ami-017fecd1353bcc96e"
242-
},
243-
"us-west-1": {
244-
"HVM64": "ami-02ea247e531eb3ce6"
245-
},
246-
"eu-west-1": {
247-
"HVM64": "ami-096800910c1b781ba"
248-
},
249-
"eu-west-2": {
250-
"HVM64": "ami-0f540e9f488cfa27d"
251-
},
252-
"eu-west-3": {
253-
"HVM64": "ami-0493936afbe820b28"
254-
},
255-
"eu-central-1": {
256-
"HVM64": "ami-0caef02b518350c8b"
257-
},
258-
"ap-northeast-1": {
259-
"HVM64": "ami-03f4fa076d2981b45"
260-
},
261-
"ap-northeast-2": {
262-
"HVM64": "ami-0e9bfdb247cc8de84"
263-
},
264-
"ap-northeast-3": {
265-
"HVM64": "ami-08c2ee02329b72f26"
266-
},
267-
"ap-southeast-1": {
268-
"HVM64": "ami-07651f0c4c315a529"
269-
},
270-
"ap-southeast-2": {
271-
"HVM64": "ami-09a5c873bc79530d9"
272-
},
273-
"ap-south-1": {
274-
"HVM64": "ami-062df10d14676e201"
275-
},
276-
"us-east-2": {
277-
"HVM64": "ami-097a2df4ac947655f"
278-
},
279-
"ca-central-1": {
280-
"HVM64": "ami-0a7154091c5c6623e"
281-
},
282-
"sa-east-1": {
283-
"HVM64": "ami-04b3c23ec8efcc2d6"
284-
}
79+
"InstanceAMI": {
80+
"Description": "Managed AMI ID for EC2 Instance",
81+
"Type": "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>",
82+
"Default": "/aws/service/canonical/ubuntu/eks-pro/22.04/1.29/stable/current/amd64/hvm/ebs-gp2/ami-id"
28583
}
28684
},
28785
"Resources": {
@@ -340,30 +138,19 @@
340138
"SubnetId": {
341139
"Ref": "SubnetId"
342140
},
343-
"SecurityGroups": [
141+
"SecurityGroupIds": [
344142
{
345-
"Ref": "InstanceSecurityGroup"
143+
"Fn::GetAtt": [
144+
"InstanceSecurityGroup",
145+
"GroupId"
146+
]
346147
}
347148
],
348149
"KeyName": {
349150
"Ref": "KeyName"
350151
},
351152
"ImageId": {
352-
"Fn::FindInMap": [
353-
"AWSRegionArch2AMI",
354-
{
355-
"Ref": "AWS::Region"
356-
},
357-
{
358-
"Fn::FindInMap": [
359-
"AWSInstanceType2Arch",
360-
{
361-
"Ref": "InstanceType"
362-
},
363-
"Arch"
364-
]
365-
}
366-
]
153+
"Ref": "InstanceAMI"
367154
},
368155
"UserData": {
369156
"Fn::Base64": {

0 commit comments

Comments
 (0)