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

Commit 1d3c44f

Browse files
davmayddavmayd
committed
Hard-coding 5/25/2022 AMIs
1 parent 64e21f8 commit 1d3c44f

File tree

4 files changed

+127
-6
lines changed

4 files changed

+127
-6
lines changed

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.DS_Store
2+
taskcat_outputs/*
3+
.taskcat_overrides.yml
4+
.taskcat
5+
.taskcat/*

‎templates/microsoft-pki-main.template.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ Resources:
356356
Properties:
357357
TemplateURL:
358358
!Sub
359-
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/quickstart-aws-vpc/templates/aws-vpc.template.yaml'
359+
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}submodules/quickstart-aws-vpc/templates/aws-vpc.template.yaml'
360360
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
361361
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
362362
Parameters:
@@ -374,7 +374,7 @@ Resources:
374374
Properties:
375375
TemplateURL:
376376
!Sub
377-
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/quickstart-microsoft-activedirectory/templates/ad-1.template'
377+
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}submodules/quickstart-microsoft-activedirectory/templates/ad-1.template'
378378
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
379379
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
380380
Parameters:
@@ -397,7 +397,7 @@ Resources:
397397
Properties:
398398
TemplateURL:
399399
!Sub
400-
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/quickstart-microsoft-rdgateway/templates/rdgw-domain.template'
400+
- 'https://${S3Bucket}.s3.${S3Region}.${AWS::URLSuffix}/${QSS3KeyPrefix}submodules/quickstart-microsoft-rdgateway/templates/rdgw-domain.template'
401401
- S3Region: !If [UsingDefaultBucket, !Ref 'AWS::Region', !Ref QSS3BucketRegion]
402402
S3Bucket: !If [UsingDefaultBucket, !Sub '${QSS3BucketName}-${AWS::Region}', !Ref QSS3BucketName]
403403
Parameters:

‎templates/one-tier.template

+59-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,65 @@ Conditions:
259259
UsingDefaultBucket: !Equals [!Ref QSS3BucketName, 'aws-quickstart']
260260
UsingS3BucketForCrl: !Equals [!Ref UseS3ForCRL, 'Yes']
261261
UsingLocalIisCrl: !Equals [!Ref UseS3ForCRL, 'No']
262+
Mappings:
263+
AWSAMIRegionMap:
264+
AMI:
265+
WIN2022: Windows_Server-2022-English-Full-Base-2022.05.25
266+
af-south-1:
267+
WIN2022: ami-0b07b0278ae9ce898
268+
eu-north-1:
269+
WIN2022: ami-05a907e9a75aa1053
270+
ap-south-1:
271+
WIN2022: ami-0160ed10cac10112b
272+
eu-west-3:
273+
WIN2022: ami-020bcfb620c9099fa
274+
eu-west-2:
275+
WIN2022: ami-0cfa1d293412be4a1
276+
eu-south-1:
277+
WIN2022: ami-02a714ee932224788
278+
eu-west-1:
279+
WIN2022: ami-036b3cebc6c85a337
280+
ap-northeast-3:
281+
WIN2022: ami-09b5a925281093c9d
282+
ap-northeast-2:
283+
WIN2022: ami-05f568435c23c9262
284+
me-south-1:
285+
WIN2022: ami-0a2be867bdb4dbe3b
286+
ap-northeast-1:
287+
WIN2022: ami-036226b72061670d4
288+
sa-east-1:
289+
WIN2022: ami-0dec1f3e1cf059415
290+
ca-central-1:
291+
WIN2022: ami-069d17915633e74de
292+
ap-east-1:
293+
WIN2022: ami-056ff2ea33643a963
294+
ap-southeast-1:
295+
WIN2022: ami-0d122caff064ce2fe
296+
ap-southeast-2:
297+
WIN2022: ami-00eb0c11b2c8b2622
298+
eu-central-1:
299+
WIN2022: ami-0c9c3ce7702026bab
300+
ap-southeast-3:
301+
WIN2022: ami-07d266c68d6d228f9
302+
us-east-1:
303+
WIN2022: ami-0e4eb3558ed6398c8
304+
us-east-2:
305+
WIN2022: ami-0faf36afaee58e7fd
306+
us-west-1:
307+
WIN2022: ami-088a9dfaf784ee366
308+
us-west-2:
309+
WIN2022: ami-0d7ded39371c2d521
310+
us-gov-west-1:
311+
WIN2022: ami-09d3cc33d830d76b2
312+
us-gov-east-1:
313+
WIN2022: ami-060e259a4848b6a1a
262314
Resources:
315+
Windows2022AMISMParameter:
316+
Type: AWS::SSM::Parameter
317+
Properties:
318+
Type: String
319+
Value: !FindInMap [ AWSAMIRegionMap, !Ref "AWS::Region", WIN2022 ]
320+
Description: Windows Server 2022 AMI ID from AWSAMIRegionMap
263321
InstanceRole:
264322
Type: AWS::IAM::Role
265323
Metadata:
@@ -677,7 +735,7 @@ Resources:
677735
Timeout: PT30M
678736
Count: 1
679737
Properties:
680-
ImageId: !Ref AMI
738+
ImageId: !GetAtt Windows2022AMISMParameter.Value
681739
IamInstanceProfile: !Ref InstanceProfile
682740
InstanceType: !Ref EntCaServerInstanceType
683741
SubnetId: !Ref EntCaServerSubnet

‎templates/two-tier.template

+60-2
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,65 @@ Conditions:
327327
UsingDefaultBucket: !Equals [!Ref QSS3BucketName, 'aws-quickstart']
328328
UsingS3BucketForCrl: !Equals [!Ref UseS3ForCRL, 'Yes']
329329
UsingLocalIisCrl: !Equals [!Ref UseS3ForCRL, 'No']
330+
Mappings:
331+
AWSAMIRegionMap:
332+
AMI:
333+
WIN2022: Windows_Server-2022-English-Full-Base-2022.05.25
334+
af-south-1:
335+
WIN2022: ami-0b07b0278ae9ce898
336+
eu-north-1:
337+
WIN2022: ami-05a907e9a75aa1053
338+
ap-south-1:
339+
WIN2022: ami-0160ed10cac10112b
340+
eu-west-3:
341+
WIN2022: ami-020bcfb620c9099fa
342+
eu-west-2:
343+
WIN2022: ami-0cfa1d293412be4a1
344+
eu-south-1:
345+
WIN2022: ami-02a714ee932224788
346+
eu-west-1:
347+
WIN2022: ami-036b3cebc6c85a337
348+
ap-northeast-3:
349+
WIN2022: ami-09b5a925281093c9d
350+
ap-northeast-2:
351+
WIN2022: ami-05f568435c23c9262
352+
me-south-1:
353+
WIN2022: ami-0a2be867bdb4dbe3b
354+
ap-northeast-1:
355+
WIN2022: ami-036226b72061670d4
356+
sa-east-1:
357+
WIN2022: ami-0dec1f3e1cf059415
358+
ca-central-1:
359+
WIN2022: ami-069d17915633e74de
360+
ap-east-1:
361+
WIN2022: ami-056ff2ea33643a963
362+
ap-southeast-1:
363+
WIN2022: ami-0d122caff064ce2fe
364+
ap-southeast-2:
365+
WIN2022: ami-00eb0c11b2c8b2622
366+
eu-central-1:
367+
WIN2022: ami-0c9c3ce7702026bab
368+
ap-southeast-3:
369+
WIN2022: ami-07d266c68d6d228f9
370+
us-east-1:
371+
WIN2022: ami-0e4eb3558ed6398c8
372+
us-east-2:
373+
WIN2022: ami-0faf36afaee58e7fd
374+
us-west-1:
375+
WIN2022: ami-088a9dfaf784ee366
376+
us-west-2:
377+
WIN2022: ami-0d7ded39371c2d521
378+
us-gov-west-1:
379+
WIN2022: ami-09d3cc33d830d76b2
380+
us-gov-east-1:
381+
WIN2022: ami-060e259a4848b6a1a
330382
Resources:
383+
Windows2022AMISMParameter:
384+
Type: AWS::SSM::Parameter
385+
Properties:
386+
Type: String
387+
Value: !FindInMap [ AWSAMIRegionMap, !Ref "AWS::Region", WIN2022 ]
388+
Description: Windows Server 2022 AMI ID from AWSAMIRegionMap
331389
InstanceRole:
332390
Type: AWS::IAM::Role
333391
Metadata:
@@ -907,7 +965,7 @@ Resources:
907965
ORCA:
908966
Type: AWS::EC2::Instance
909967
Properties:
910-
ImageId: !Ref AMI
968+
ImageId: !GetAtt Windows2022AMISMParameter.Value
911969
IamInstanceProfile: !Ref InstanceProfile
912970
InstanceType: !Ref OrCaServerInstanceType
913971
SubnetId: !Ref OrCaServerSubnet
@@ -943,7 +1001,7 @@ Resources:
9431001
Timeout: PT45M
9441002
Count: 1
9451003
Properties:
946-
ImageId: !Ref AMI
1004+
ImageId: !GetAtt Windows2022AMISMParameter.Value
9471005
IamInstanceProfile: !Ref InstanceProfile
9481006
InstanceType: !Ref SubCaServerInstanceType
9491007
SubnetId: !Ref SubCaServerSubnet

0 commit comments

Comments
 (0)