cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove double-specified EC2 ASG test parameters (#34714)

Browse source 
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.
This commit is contained in:
Ryan Brown 2018-01-10 17:44:40 -05:00 committed by Will Thames
parent 513e0547b9
commit b60c67d329
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
test/integration/targets/ec2_asg/tasks/main.yml
View file

@ -41,8 +41,6 @@
ec2_vpc_net: ec2_vpc_net:
name: "{{ resource_prefix }}-vpc" name: "{{ resource_prefix }}-vpc"
cidr_block: 10.55.77.0/24 cidr_block: 10.55.77.0/24
tags:
Name: Ansible Testing VPC
tenancy: default tenancy: default
<<: *aws_connection_info <<: *aws_connection_info
register: testing_vpc register: testing_vpc
@ -56,13 +54,12 @@
- name: Create subnet for use in testing - name: Create subnet for use in testing
ec2_vpc_subnet: ec2_vpc_subnet:
tags: "{{ resource_prefix }}-subnet"
state: present state: present
vpc_id: "{{ testing_vpc.vpc.id }}" vpc_id: "{{ testing_vpc.vpc.id }}"
cidr: 10.55.77.0/24 cidr: 10.55.77.0/24
az: "{{ aws_region }}a" az: "{{ aws_region }}a"
resource_tags: resource_tags:
Name: Ansible Testing Subnet Name: "{{ resource_prefix }}-subnet"
<<: *aws_connection_info <<: *aws_connection_info
register: testing_subnet register: testing_subnet
@ -412,13 +409,9 @@
- name: remove the subnet - name: remove the subnet
ec2_vpc_subnet: ec2_vpc_subnet:
tags: "{{ resource_prefix }}-subnet"
state: absent state: absent
vpc_id: "{{ testing_vpc.vpc.id }}" vpc_id: "{{ testing_vpc.vpc.id }}"
cidr: 10.55.77.0/24 cidr: 10.55.77.0/24
az: "{{ aws_region }}a"
resource_tags:
Name: Ansible Testing Subnet
<<: *aws_connection_info <<: *aws_connection_info
register: removed register: removed
until: removed is not failed until: removed is not failed
@ -430,9 +423,6 @@
name: "{{ resource_prefix }}-vpc" name: "{{ resource_prefix }}-vpc"
cidr_block: 10.55.77.0/24 cidr_block: 10.55.77.0/24
state: absent state: absent
tags:
Name: Ansible Testing VPC
tenancy: default
<<: *aws_connection_info <<: *aws_connection_info
register: removed register: removed
until: removed is not failed until: removed is not failed