From be53b4b00af1ec690dc2c06b5637495ed4de0ba8 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 21 Nov 2024 11:08:05 -0500 Subject: [PATCH 1/4] Add module_defaults to ec2_networking_resources role --- roles/ec2_networking_resources/tasks/main.yml | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/roles/ec2_networking_resources/tasks/main.yml b/roles/ec2_networking_resources/tasks/main.yml index 440392b7..a098fccc 100644 --- a/roles/ec2_networking_resources/tasks/main.yml +++ b/roles/ec2_networking_resources/tasks/main.yml @@ -1,25 +1,29 @@ --- -- name: Create VPC - amazon.aws.ec2_vpc_net: - name: "{{ ec2_networking_resources_vpc_name }}" - cidr_block: "{{ ec2_networking_resources_vpc_cidr_block }}" - register: ec2_networking_resources_vpc_result +- name: Run backup_create_plan_role + module_defaults: + group/aws: "{{ aws_setup_credentials__output }}" + block: + - name: Create VPC + amazon.aws.ec2_vpc_net: + name: "{{ ec2_networking_resources_vpc_name }}" + cidr_block: "{{ ec2_networking_resources_vpc_cidr_block }}" + register: ec2_networking_resources_vpc_result -- name: Create VPC subnet - amazon.aws.ec2_vpc_subnet: - vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" - cidr: "{{ ec2_networking_resources_subnet_cidr_block }}" - register: ec2_networking_resources_subnet_result + - name: Create VPC subnet + amazon.aws.ec2_vpc_subnet: + vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" + cidr: "{{ ec2_networking_resources_subnet_cidr_block }}" + register: ec2_networking_resources_subnet_result -- name: Create route table - amazon.aws.ec2_vpc_route_table: - vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" - subnets: - - "{{ ec2_networking_resources_subnet_result.subnet.id }}" + - name: Create route table + amazon.aws.ec2_vpc_route_table: + vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" + subnets: + - "{{ ec2_networking_resources_subnet_result.subnet.id }}" -- name: Create security group for internal access - amazon.aws.ec2_security_group: - vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" - name: "{{ ec2_networking_resources_sg_internal_name }}" - description: "{{ ec2_networking_resources_sg_internal_description }}" - rules: "{{ ec2_networking_resources_sg_internal_rules }}" + - name: Create security group for internal access + amazon.aws.ec2_security_group: + vpc_id: "{{ ec2_networking_resources_vpc_result.vpc.id }}" + name: "{{ ec2_networking_resources_sg_internal_name }}" + description: "{{ ec2_networking_resources_sg_internal_description }}" + rules: "{{ ec2_networking_resources_sg_internal_rules }}" From e4c95f97b645e987764336ad6a584af9751dfdac Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 21 Nov 2024 11:13:22 -0500 Subject: [PATCH 2/4] Add changelog --- .../fragments/add_module_defaults_ec2_networking_resource.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/add_module_defaults_ec2_networking_resource.yml diff --git a/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml b/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml new file mode 100644 index 00000000..b9f694f5 --- /dev/null +++ b/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml @@ -0,0 +1,2 @@ +minor_changes: + - Add module_defaults to ec2_networking_resources role which is necessary for correctly setting the aws_setup_credentials (https://github.com/redhat-cop/cloud.aws_ops/pull/124). From 431674d60a321dc056c06727112e4e6c73443de1 Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 21 Nov 2024 12:03:45 -0500 Subject: [PATCH 3/4] Update roles/ec2_networking_resources/tasks/main.yml Co-authored-by: Mike Graves --- roles/ec2_networking_resources/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ec2_networking_resources/tasks/main.yml b/roles/ec2_networking_resources/tasks/main.yml index a098fccc..9564020f 100644 --- a/roles/ec2_networking_resources/tasks/main.yml +++ b/roles/ec2_networking_resources/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: Run backup_create_plan_role +- name: Run ec2_networking_resources role module_defaults: group/aws: "{{ aws_setup_credentials__output }}" block: From bef455c7c848c5c119e03d830056e80d762f409b Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Thu, 21 Nov 2024 12:04:09 -0500 Subject: [PATCH 4/4] Delete changelogs/fragments/add_module_defaults_ec2_networking_resource.yml --- .../fragments/add_module_defaults_ec2_networking_resource.yml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 changelogs/fragments/add_module_defaults_ec2_networking_resource.yml diff --git a/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml b/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml deleted file mode 100644 index b9f694f5..00000000 --- a/changelogs/fragments/add_module_defaults_ec2_networking_resource.yml +++ /dev/null @@ -1,2 +0,0 @@ -minor_changes: - - Add module_defaults to ec2_networking_resources role which is necessary for correctly setting the aws_setup_credentials (https://github.com/redhat-cop/cloud.aws_ops/pull/124).