diff --git a/ecs/cluster-cost-optimized.yaml b/ecs/cluster-cost-optimized.yaml index a367d8d0d..26844a497 100644 --- a/ecs/cluster-cost-optimized.yaml +++ b/ecs/cluster-cost-optimized.yaml @@ -175,61 +175,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - ECSAMI: 'ami-0d9e5454c28d0b61b' + ECSAMI: 'ami-0c6a9158aa626dba6' 'ap-south-1': - ECSAMI: 'ami-03e75332ffeeb512f' + ECSAMI: 'ami-0224887a04cbb496b' 'eu-south-1': - ECSAMI: 'ami-0a209ebeb0b56bf98' + ECSAMI: 'ami-0738c52cab504c39d' 'eu-south-2': - ECSAMI: 'ami-0fab6c6e1f92f8997' + ECSAMI: 'ami-0ae97fb73edb6304b' 'me-central-1': - ECSAMI: 'ami-0b6e5ab663e48d7f0' + ECSAMI: 'ami-02020456ca51eb66a' 'il-central-1': - ECSAMI: 'ami-0ca0a2c6a9ec9ef0a' + ECSAMI: 'ami-0c96769e65b70e6ac' 'ca-central-1': - ECSAMI: 'ami-04c4755874f196c5b' + ECSAMI: 'ami-07bdaf33625c33e2b' 'eu-central-1': - ECSAMI: 'ami-031ef26e74b8f374c' + ECSAMI: 'ami-03be4508cf4911bd4' 'eu-central-2': - ECSAMI: 'ami-01a7882eaf4658b70' + ECSAMI: 'ami-037a122dbb76ddeab' 'us-west-1': - ECSAMI: 'ami-020e3784a4501250b' + ECSAMI: 'ami-0711f233b3e719971' 'us-west-2': - ECSAMI: 'ami-080b1e312f29aebbb' + ECSAMI: 'ami-0f53d557e55fc7064' 'af-south-1': - ECSAMI: 'ami-01088f23e721619df' + ECSAMI: 'ami-0c635e3dd7eefb8ce' 'eu-north-1': - ECSAMI: 'ami-086b83333c1316350' + ECSAMI: 'ami-070eeee5101b94aa0' 'eu-west-3': - ECSAMI: 'ami-073deb7e91cdf45d8' + ECSAMI: 'ami-001c9829ec6fc2bc8' 'eu-west-2': - ECSAMI: 'ami-0614d874e5d653441' + ECSAMI: 'ami-048605d80a88e436e' 'eu-west-1': - ECSAMI: 'ami-0d6c27a1bb3f71e9e' + ECSAMI: 'ami-032c1788ab8a8baaa' 'ap-northeast-3': - ECSAMI: 'ami-0092b0bb450a91100' + ECSAMI: 'ami-0d0b6762579713bc6' 'ap-northeast-2': - ECSAMI: 'ami-0d77b2fba3628df46' + ECSAMI: 'ami-08512dc5cb6d24bfa' 'me-south-1': - ECSAMI: 'ami-0bb2397da081b40ad' + ECSAMI: 'ami-01b4b953a0c5443de' 'ap-northeast-1': - ECSAMI: 'ami-01d514398745616a7' + ECSAMI: 'ami-0e8600d2547675724' 'sa-east-1': - ECSAMI: 'ami-0c7896e35be2c7c07' + ECSAMI: 'ami-0418b3feeb8156d57' 'ap-east-1': - ECSAMI: 'ami-0be1891b40fbd5e94' + ECSAMI: 'ami-0582d8da312b21697' 'ap-southeast-1': - ECSAMI: 'ami-062a3e3b74bb5b4c5' + ECSAMI: 'ami-0a6fe191df026a602' 'ap-southeast-2': - ECSAMI: 'ami-0775ca431543b2151' + ECSAMI: 'ami-0593d7e1431e9c0c2' 'ap-southeast-3': - ECSAMI: 'ami-0f8d56e80803463d8' + ECSAMI: 'ami-0c2b5236eba1b8f73' 'ap-southeast-4': - ECSAMI: 'ami-09569e92116d16a0e' + ECSAMI: 'ami-0aa18b3d71abece9c' 'us-east-1': - ECSAMI: 'ami-0fec9863172e50c93' + ECSAMI: 'ami-04215982dedb895b4' 'us-east-2': - ECSAMI: 'ami-05383c67c111ecf57' + ECSAMI: 'ami-0b7778d86d8789cff' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/ecs/cluster.yaml b/ecs/cluster.yaml index 83e6131c7..b7eb3f807 100644 --- a/ecs/cluster.yaml +++ b/ecs/cluster.yaml @@ -207,61 +207,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - ECSAMI: 'ami-0d9e5454c28d0b61b' + ECSAMI: 'ami-0c6a9158aa626dba6' 'ap-south-1': - ECSAMI: 'ami-03e75332ffeeb512f' + ECSAMI: 'ami-0224887a04cbb496b' 'eu-south-1': - ECSAMI: 'ami-0a209ebeb0b56bf98' + ECSAMI: 'ami-0738c52cab504c39d' 'eu-south-2': - ECSAMI: 'ami-0fab6c6e1f92f8997' + ECSAMI: 'ami-0ae97fb73edb6304b' 'me-central-1': - ECSAMI: 'ami-0b6e5ab663e48d7f0' + ECSAMI: 'ami-02020456ca51eb66a' 'il-central-1': - ECSAMI: 'ami-0ca0a2c6a9ec9ef0a' + ECSAMI: 'ami-0c96769e65b70e6ac' 'ca-central-1': - ECSAMI: 'ami-04c4755874f196c5b' + ECSAMI: 'ami-07bdaf33625c33e2b' 'eu-central-1': - ECSAMI: 'ami-031ef26e74b8f374c' + ECSAMI: 'ami-03be4508cf4911bd4' 'eu-central-2': - ECSAMI: 'ami-01a7882eaf4658b70' + ECSAMI: 'ami-037a122dbb76ddeab' 'us-west-1': - ECSAMI: 'ami-020e3784a4501250b' + ECSAMI: 'ami-0711f233b3e719971' 'us-west-2': - ECSAMI: 'ami-080b1e312f29aebbb' + ECSAMI: 'ami-0f53d557e55fc7064' 'af-south-1': - ECSAMI: 'ami-01088f23e721619df' + ECSAMI: 'ami-0c635e3dd7eefb8ce' 'eu-north-1': - ECSAMI: 'ami-086b83333c1316350' + ECSAMI: 'ami-070eeee5101b94aa0' 'eu-west-3': - ECSAMI: 'ami-073deb7e91cdf45d8' + ECSAMI: 'ami-001c9829ec6fc2bc8' 'eu-west-2': - ECSAMI: 'ami-0614d874e5d653441' + ECSAMI: 'ami-048605d80a88e436e' 'eu-west-1': - ECSAMI: 'ami-0d6c27a1bb3f71e9e' + ECSAMI: 'ami-032c1788ab8a8baaa' 'ap-northeast-3': - ECSAMI: 'ami-0092b0bb450a91100' + ECSAMI: 'ami-0d0b6762579713bc6' 'ap-northeast-2': - ECSAMI: 'ami-0d77b2fba3628df46' + ECSAMI: 'ami-08512dc5cb6d24bfa' 'me-south-1': - ECSAMI: 'ami-0bb2397da081b40ad' + ECSAMI: 'ami-01b4b953a0c5443de' 'ap-northeast-1': - ECSAMI: 'ami-01d514398745616a7' + ECSAMI: 'ami-0e8600d2547675724' 'sa-east-1': - ECSAMI: 'ami-0c7896e35be2c7c07' + ECSAMI: 'ami-0418b3feeb8156d57' 'ap-east-1': - ECSAMI: 'ami-0be1891b40fbd5e94' + ECSAMI: 'ami-0582d8da312b21697' 'ap-southeast-1': - ECSAMI: 'ami-062a3e3b74bb5b4c5' + ECSAMI: 'ami-0a6fe191df026a602' 'ap-southeast-2': - ECSAMI: 'ami-0775ca431543b2151' + ECSAMI: 'ami-0593d7e1431e9c0c2' 'ap-southeast-3': - ECSAMI: 'ami-0f8d56e80803463d8' + ECSAMI: 'ami-0c2b5236eba1b8f73' 'ap-southeast-4': - ECSAMI: 'ami-09569e92116d16a0e' + ECSAMI: 'ami-0aa18b3d71abece9c' 'us-east-1': - ECSAMI: 'ami-0fec9863172e50c93' + ECSAMI: 'ami-04215982dedb895b4' 'us-east-2': - ECSAMI: 'ami-05383c67c111ecf57' + ECSAMI: 'ami-0b7778d86d8789cff' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/jenkins/jenkins2-ha-agents.yaml b/jenkins/jenkins2-ha-agents.yaml index c34a4189b..5ce31fac9 100644 --- a/jenkins/jenkins2-ha-agents.yaml +++ b/jenkins/jenkins2-ha-agents.yaml @@ -219,61 +219,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasZeroAgents: !Equals [!Ref AgentMinSize, '0'] diff --git a/jenkins/jenkins2-ha.yaml b/jenkins/jenkins2-ha.yaml index 4493bd789..72d5c35f1 100644 --- a/jenkins/jenkins2-ha.yaml +++ b/jenkins/jenkins2-ha.yaml @@ -167,61 +167,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/security/auth-proxy-ha-github-orga.yaml b/security/auth-proxy-ha-github-orga.yaml index 5c0dfaf24..8903660b7 100644 --- a/security/auth-proxy-ha-github-orga.yaml +++ b/security/auth-proxy-ha-github-orga.yaml @@ -145,61 +145,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/vpc/README.md b/vpc/README.md index 0090959eb..1c4f8d2d1 100644 --- a/vpc/README.md +++ b/vpc/README.md @@ -14,5 +14,5 @@ for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output #### NATAMI ``` -for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output text); do ami=$(aws --region $region ec2 describe-images --filters 'Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20230918.0-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n NATAMI: '$ami'\n"; done +for region in $(aws ec2 describe-regions --query 'Regions[].RegionName' --output text); do ami=$(aws --region $region ec2 describe-images --filters 'Name=name,Values=amzn-ami-vpc-nat-2018.03.0.20231024.0-x86_64-ebs' --query 'Images[0].ImageId' --output text); printf "'$region':\n NATAMI: '$ami'\n"; done ``` diff --git a/vpc/vpc-nat-instance.yaml b/vpc/vpc-nat-instance.yaml index 8710b7eb2..4c52c9f4b 100644 --- a/vpc/vpc-nat-instance.yaml +++ b/vpc/vpc-nat-instance.yaml @@ -99,61 +99,61 @@ Parameters: Mappings: RegionMap: # TODO update to Amazon Linux 2 (don't forget to adjust awslogs config as well) 'ap-south-2': - NATAMI: 'ami-04db8228134fd0348' + NATAMI: 'ami-05cea2caeacb90062' 'ap-south-1': - NATAMI: 'ami-0d72bc3916f5c4e3f' + NATAMI: 'ami-003d3a72d9cdca43a' 'eu-south-1': - NATAMI: 'ami-0adaf366ed21f6ac8' + NATAMI: 'ami-0059ad3647cb8eaad' 'eu-south-2': - NATAMI: 'ami-06f8fd0e3e03f7ca8' + NATAMI: 'ami-0ef62adf390ac6eda' 'me-central-1': - NATAMI: 'ami-0f841582f68e4fcab' + NATAMI: 'ami-07641466c451b8287' 'il-central-1': - NATAMI: 'ami-0500414f74bc50e82' + NATAMI: 'ami-0d6d88f48997db311' 'ca-central-1': - NATAMI: 'ami-0456bc7879504f482' + NATAMI: 'ami-0f1779932de794f63' 'eu-central-1': - NATAMI: 'ami-01c795b4aaad2268e' + NATAMI: 'ami-0fb9e49352123c1ce' 'eu-central-2': - NATAMI: 'ami-0665919480e8eebcb' + NATAMI: 'ami-09a6efaa8c8feb739' 'us-west-1': - NATAMI: 'ami-0158169a186af8bbf' + NATAMI: 'ami-0d74c54876dba2ad4' 'us-west-2': - NATAMI: 'ami-0b9cc2113befaffc1' + NATAMI: 'ami-023822f155589cfe1' 'af-south-1': - NATAMI: 'ami-0876eec8f285e3933' + NATAMI: 'ami-074db643046d03427' 'eu-north-1': - NATAMI: 'ami-085ee0efe52e19839' + NATAMI: 'ami-0e93dd814b660758a' 'eu-west-3': - NATAMI: 'ami-0504ef8af95ce635f' + NATAMI: 'ami-0d65c6adbb8cfbc0a' 'eu-west-2': - NATAMI: 'ami-0c04b9cc71427721a' + NATAMI: 'ami-092bea42b89503c33' 'eu-west-1': - NATAMI: 'ami-015b58193d83be259' + NATAMI: 'ami-08076c17544f5dada' 'ap-northeast-3': - NATAMI: 'ami-0abdd26c798aa8ae6' + NATAMI: 'ami-0996f031f9c7054bb' 'ap-northeast-2': - NATAMI: 'ami-035bd0fed9c9525f6' + NATAMI: 'ami-0ec4c1d239c10287e' 'me-south-1': - NATAMI: 'ami-0e770cc1fa3703fdb' + NATAMI: 'ami-0a5c1711abebbe403' 'ap-northeast-1': - NATAMI: 'ami-077a0e989c1c14707' + NATAMI: 'ami-06e4c80b35cec2a0e' 'sa-east-1': - NATAMI: 'ami-00eacee1c13aaa1c7' + NATAMI: 'ami-01b7687a6815f56ab' 'ap-east-1': - NATAMI: 'ami-01ddafdcfa3ead4ab' + NATAMI: 'ami-05119a6c573209f0b' 'ap-southeast-1': - NATAMI: 'ami-04c35b4deb7ed561d' + NATAMI: 'ami-067f82852ed9e1428' 'ap-southeast-2': - NATAMI: 'ami-06dafb7ec372d31ee' + NATAMI: 'ami-08a362b83f7075e61' 'ap-southeast-3': - NATAMI: 'ami-01cd9f8a3f5cbb952' + NATAMI: 'ami-025daa26a2bb7dc59' 'ap-southeast-4': - NATAMI: 'ami-0dcfb60e1007b8017' + NATAMI: 'ami-0696dfa80b6652fd8' 'us-east-1': - NATAMI: 'ami-0c6dac030329381b4' + NATAMI: 'ami-0b15d0e49cdb9de5d' 'us-east-2': - NATAMI: 'ami-0e7cc90bc399ce3d4' + NATAMI: 'ami-0e6b9ffb1acdc0aa7' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/vpc/vpc-ssh-bastion.yaml b/vpc/vpc-ssh-bastion.yaml index b530c7ad7..7128ffb5e 100644 --- a/vpc/vpc-ssh-bastion.yaml +++ b/vpc/vpc-ssh-bastion.yaml @@ -91,61 +91,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/vpc/vpc-vpn-bastion.yaml b/vpc/vpc-vpn-bastion.yaml index 083c1dccb..8ffbed79c 100644 --- a/vpc/vpc-vpn-bastion.yaml +++ b/vpc/vpc-vpn-bastion.yaml @@ -133,61 +133,61 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] HasKeyName: !Not [!Equals [!Ref KeyName, '']] diff --git a/wordpress/wordpress-ha-aurora.yaml b/wordpress/wordpress-ha-aurora.yaml index f582ecdaf..86a0b8dc2 100644 --- a/wordpress/wordpress-ha-aurora.yaml +++ b/wordpress/wordpress-ha-aurora.yaml @@ -191,88 +191,88 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' PrefixListCloudFront: 'pl-0a25c3463226fcc61' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' PrefixListCloudFront: 'pl-9aa247f3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' PrefixListCloudFront: 'pl-1bbc5972' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' PrefixListCloudFront: 'pl-052dcbe0f793f19da' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' PrefixListCloudFront: 'pl-05266a86378662c23' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' PrefixListCloudFront: 'pl-0dd89524416301988' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' PrefixListCloudFront: 'pl-38a64351' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' PrefixListCloudFront: 'pl-a3a144ca' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' PrefixListCloudFront: 'pl-00b37293991dbe6a8' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' PrefixListCloudFront: 'pl-4ea04527' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' PrefixListCloudFront: 'pl-82a045eb' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' PrefixListCloudFront: 'pl-c0aa4fa9' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' PrefixListCloudFront: 'pl-fab65393' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' PrefixListCloudFront: 'pl-75b1541c' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' PrefixListCloudFront: 'pl-93a247fa' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' PrefixListCloudFront: 'pl-4fa04526' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' PrefixListCloudFront: 'pl-31a14458' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' PrefixListCloudFront: 'pl-22a6434b' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' PrefixListCloudFront: 'pl-17b2577e' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' PrefixListCloudFront: 'pl-58a04531' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' PrefixListCloudFront: 'pl-5da64334' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' PrefixListCloudFront: 'pl-14b2577d' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' PrefixListCloudFront: 'pl-31a34658' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' PrefixListCloudFront: 'pl-b8a742d1' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' PrefixListCloudFront: 'pl-bca247d5' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' PrefixListCloudFront: 'pl-3b927c52' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' PrefixListCloudFront: 'pl-b6a144df' Conditions: HasPermissionsBoundary: !Not [!Equals [!Ref PermissionsBoundary, '']] diff --git a/wordpress/wordpress-ha.yaml b/wordpress/wordpress-ha.yaml index 788fc1f5e..8a7ee1e68 100644 --- a/wordpress/wordpress-ha.yaml +++ b/wordpress/wordpress-ha.yaml @@ -228,88 +228,88 @@ Parameters: Mappings: RegionMap: 'ap-south-2': - AMI: 'ami-09ec6c49d26d0518f' + AMI: 'ami-005211cf59ee548ea' PrefixListCloudFront: 'pl-0a25c3463226fcc61' 'ap-south-1': - AMI: 'ami-020562d2cd769c81b' + AMI: 'ami-0591f4a31aad142d3' PrefixListCloudFront: 'pl-9aa247f3' 'eu-south-1': - AMI: 'ami-08a273089ab10bfda' + AMI: 'ami-0de6843768d97e24a' PrefixListCloudFront: 'pl-1bbc5972' 'eu-south-2': - AMI: 'ami-0295ec06d7ecf07a2' + AMI: 'ami-08cb101d16b9840bf' PrefixListCloudFront: 'pl-052dcbe0f793f19da' 'me-central-1': - AMI: 'ami-0911d5289b0ceaafa' + AMI: 'ami-00c32958f9b46f93b' PrefixListCloudFront: 'pl-05266a86378662c23' 'il-central-1': - AMI: 'ami-0f552ebe7c7bc7655' + AMI: 'ami-01719ec291a27d947' PrefixListCloudFront: 'pl-0dd89524416301988' 'ca-central-1': - AMI: 'ami-09fa72aa5ea159b61' + AMI: 'ami-03d49c3fb950684d3' PrefixListCloudFront: 'pl-38a64351' 'eu-central-1': - AMI: 'ami-0d2820455d08be628' + AMI: 'ami-05cd636d876311f80' PrefixListCloudFront: 'pl-a3a144ca' 'eu-central-2': - AMI: 'ami-0a37533ef40d2f340' + AMI: 'ami-0f48d1788c193cc46' PrefixListCloudFront: 'pl-00b37293991dbe6a8' 'us-west-1': - AMI: 'ami-01cff12e087f492c6' + AMI: 'ami-0e06911c995520f34' PrefixListCloudFront: 'pl-4ea04527' 'us-west-2': - AMI: 'ami-0044a0897b53acfb6' + AMI: 'ami-060f936aec9003903' PrefixListCloudFront: 'pl-82a045eb' 'af-south-1': - AMI: 'ami-0e0da87fdaf927717' + AMI: 'ami-0ede458d3d05559a5' PrefixListCloudFront: 'pl-c0aa4fa9' 'eu-north-1': - AMI: 'ami-0312b506c46eb9f64' + AMI: 'ami-09312d5a2dd62bbea' PrefixListCloudFront: 'pl-fab65393' 'eu-west-3': - AMI: 'ami-05d9ff5247ae93752' + AMI: 'ami-09edbb170cde0ca31' PrefixListCloudFront: 'pl-75b1541c' 'eu-west-2': - AMI: 'ami-0db2efede9f8bb581' + AMI: 'ami-03ec2be5a474ffee7' PrefixListCloudFront: 'pl-93a247fa' 'eu-west-1': - AMI: 'ami-052b48dff01bd3a2d' + AMI: 'ami-0a123353df8e77189' PrefixListCloudFront: 'pl-4fa04526' 'ap-northeast-3': - AMI: 'ami-07795c2951dc11ce7' + AMI: 'ami-041d2bbeb674fd992' PrefixListCloudFront: 'pl-31a14458' 'ap-northeast-2': - AMI: 'ami-085a10255c2ecb4cb' + AMI: 'ami-00a08b445dc0ab8c1' PrefixListCloudFront: 'pl-22a6434b' 'me-south-1': - AMI: 'ami-0a6e54be87919a76a' + AMI: 'ami-0f90056caddf83573' PrefixListCloudFront: 'pl-17b2577e' 'ap-northeast-1': - AMI: 'ami-0e3ceefc9a200a838' + AMI: 'ami-0e402d620b1085dbb' PrefixListCloudFront: 'pl-58a04531' 'sa-east-1': - AMI: 'ami-0df03a6401e7a2943' + AMI: 'ami-0d0ae91b9f0773ec5' PrefixListCloudFront: 'pl-5da64334' 'ap-east-1': - AMI: 'ami-05676b11acc4161d5' + AMI: 'ami-0b0b21b5de88ebfd9' PrefixListCloudFront: 'pl-14b2577d' 'ap-southeast-1': - AMI: 'ami-044d69b8549e33ff1' + AMI: 'ami-0433c5a120721d053' PrefixListCloudFront: 'pl-31a34658' 'ap-southeast-2': - AMI: 'ami-0e166015f8dee9d71' + AMI: 'ami-0fa4c765f7a72fe01' PrefixListCloudFront: 'pl-b8a742d1' 'ap-southeast-3': - AMI: 'ami-0f8159cc3ab5fffaf' + AMI: 'ami-0e36a4227f0d1a1ee' PrefixListCloudFront: 'pl-bca247d5' 'ap-southeast-4': - AMI: 'ami-04864bb4b01bd8038' + AMI: 'ami-05dd383023681ca75' PrefixListCloudFront: 'pl-0fb7e7cfe038ae0e9' 'us-east-1': - AMI: 'ami-0d887a308369b6881' + AMI: 'ami-0c9e929defa073d7d' PrefixListCloudFront: 'pl-3b927c52' 'us-east-2': - AMI: 'ami-0e534f3e5321ed9ed' + AMI: 'ami-092963d5b506a4c41' PrefixListCloudFront: 'pl-b6a144df' DBServerInstanceTypeMap: 'db.t3.micro':