From b60c67d3296662ac7ce4b8f95bb73fc600024526 Mon Sep 17 00:00:00 2001 From: Ryan Brown Date: Wed, 10 Jan 2018 17:44:40 -0500 Subject: [PATCH] Remove double-specified EC2 ASG test parameters (#34714) In the ec2_asg integration tests there are a couple places where parameters are specified twice (as bot `tag.Name` and `name:`) and others where those parameters aren't needed for the state requested. --- test/integration/targets/ec2_asg/tasks/main.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/test/integration/targets/ec2_asg/tasks/main.yml b/test/integration/targets/ec2_asg/tasks/main.yml index 47f535ff23..c6ed7236e2 100644 --- a/test/integration/targets/ec2_asg/tasks/main.yml +++ b/test/integration/targets/ec2_asg/tasks/main.yml @@ -41,8 +41,6 @@ ec2_vpc_net: name: "{{ resource_prefix }}-vpc" cidr_block: 10.55.77.0/24 - tags: - Name: Ansible Testing VPC tenancy: default <<: *aws_connection_info register: testing_vpc @@ -56,13 +54,12 @@ - name: Create subnet for use in testing ec2_vpc_subnet: - tags: "{{ resource_prefix }}-subnet" state: present vpc_id: "{{ testing_vpc.vpc.id }}" cidr: 10.55.77.0/24 az: "{{ aws_region }}a" resource_tags: - Name: Ansible Testing Subnet + Name: "{{ resource_prefix }}-subnet" <<: *aws_connection_info register: testing_subnet @@ -412,13 +409,9 @@ - name: remove the subnet ec2_vpc_subnet: - tags: "{{ resource_prefix }}-subnet" state: absent vpc_id: "{{ testing_vpc.vpc.id }}" cidr: 10.55.77.0/24 - az: "{{ aws_region }}a" - resource_tags: - Name: Ansible Testing Subnet <<: *aws_connection_info register: removed until: removed is not failed @@ -430,9 +423,6 @@ name: "{{ resource_prefix }}-vpc" cidr_block: 10.55.77.0/24 state: absent - tags: - Name: Ansible Testing VPC - tenancy: default <<: *aws_connection_info register: removed until: removed is not failed