diff --git a/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 b/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 index 96343c090..c87d560e0 100644 --- a/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 +++ b/roles/aws/aws_backup_validation/templates/RDS_restore_testing.j2 @@ -8,7 +8,7 @@ "ProtectedResourceType": "{{ _instance_type_restore }}", "RestoreMetadataOverrides": { "vpcSecurityGroupIds": "[\"{{ _restore_testing_sg.group_id }}\"]", - "dbsubnetgroupname": "{{ aws_vpc.name }}" + "dbsubnetgroupname": "{{ _aws_rds_rds_subnet_group.name }}" }, "RestoreTestingSelectionName": "{{ backup.selection_name | replace("-", "_") }}", "ValidationWindowHours": 1 diff --git a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml index fdc8384c6..a59c74253 100644 --- a/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml +++ b/roles/aws/aws_ec2_autoscale_cluster/tasks/main.yml @@ -305,6 +305,7 @@ - aws_ec2_autoscale_cluster.type == "ec2" - aws_ec2_autoscale_cluster.deploy_cluster + - name: Create ami cleanup function ansible.builtin.include_role: name: aws/aws_ami_asg_cleanup