1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-07-06 02:28:53 +00:00

AWS: _facts -> _info (part 3) (#57635)

* Rename ec2_ami_facts -> ec2_ami_info.

* Rename ec2_asg_facts -> ec2_asg_info.

* Rename ec2_customer_gateway_facts -> ec2_customer_gateway_info.

* Rename ec2_eip_facts -> ec2_eip_info.

* Rename ec2_elb_facts -> ec2_elb_info.

* Rename ec2_eni_facts -> ec2_eni_info.

* Rename ec2_group_facts -> ec2_group_info.

* Rename ec2_instance_facts -> ec2_instance_info.

* Rename ec2_lc_facts -> ec2_lc_info.

* Rename ec2_placement_group_facts -> ec2_placement_group_info.

* Rename ec2_snapshot_facts -> ec2_snapshot_info.

* Rename ec2_vol_facts -> ec2_vol_info.

* Update module defaults, add changelog and porting guide.

* Forgot one occurence of ec2_instance_facts.

* Update BOTMETA.

* Break too long line.
This commit is contained in:
Felix Fontein 2019-06-10 19:33:38 +02:00 committed by GitHub
parent 1d054a6671
commit 804d5eaf8e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 280 additions and 205 deletions

View file

@ -1,4 +1,4 @@
cloud/aws
shippable/aws/group2
unstable
ec2_ami_facts
ec2_ami_info

View file

@ -125,7 +125,7 @@
# ============================================================
- name: gather facts about the image created
ec2_ami_facts:
ec2_ami_info:
image_ids: '{{ ec2_ami_image_id }}'
<<: *aws_connection_info
register: ami_facts_result
@ -353,7 +353,7 @@
- "'image_id' not in result"
- name: ensure the snapshot still exists
ec2_snapshot_facts:
ec2_snapshot_info:
snapshot_ids:
- '{{ ec2_ami_snapshot }}'
<<: *aws_connection_info

View file

@ -415,7 +415,7 @@
register: asg_job
- name: get ec2_asg facts for 3 minutes
ec2_asg_facts:
ec2_asg_info:
name: "{{ resource_prefix }}-asg"
<<: *aws_connection_info
register: output
@ -475,9 +475,9 @@
poll: 0
register: asg_job
# Collect ec2_asg_facts for 3 minutes
- name: get ec2_asg facts
ec2_asg_facts:
# Collect ec2_asg_info for 3 minutes
- name: get ec2_asg information
ec2_asg_info:
name: "{{ resource_prefix }}-asg"
<<: *aws_connection_info
register: output

View file

@ -54,7 +54,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-ebs-vols"
"instance-state-name": "running"
@ -62,7 +62,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-ebs-vols-checkmode"
"instance-state-name": "running"

View file

@ -37,7 +37,7 @@
check_mode: yes
- name: fact presented ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
"instance-state-name": "running"
@ -45,7 +45,7 @@
register: presented_instance_fact
- name: fact checkmode ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison-checkmode"
"instance-state-name": "running"
@ -67,7 +67,7 @@
check_mode: yes
- name: fact ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info
@ -86,7 +86,7 @@
<<: *aws_connection_info
- name: fact stopped ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info
@ -106,7 +106,7 @@
check_mode: yes
- name: fact ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info
@ -125,7 +125,7 @@
<<: *aws_connection_info
- name: fact ec2 instance.
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info
@ -145,7 +145,7 @@
check_mode: yes
- name: fact ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info
@ -164,7 +164,7 @@
<<: *aws_connection_info
- name: fact ec2 instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-checkmode-comparison"
<<: *aws_connection_info

View file

@ -78,7 +78,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-c4large-1-threads-per-core"
"instance-state-name": "running"
@ -86,7 +86,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-c4large-1-threads-per-core-checkmode"
"instance-state-name": "running"

View file

@ -37,7 +37,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-default-vpc"
"instance-state-name": "running"
@ -45,7 +45,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-default-vpc-checkmode"
"instance-state-name": "running"

View file

@ -21,7 +21,7 @@
register: ebs_opt_in_vpc
- name: Get ec2 instance facts
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-ebs-optimized-instance-in-vpc"
"instance-state-name": "running"

View file

@ -90,7 +90,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-eni-vpc"
"instance-state-name": "running"
@ -98,7 +98,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-eni-vpc-checkmode"
"instance-state-name": "running"

View file

@ -63,7 +63,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-instance-role"
"instance-state-name": "running"
@ -71,7 +71,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-instance-role-checkmode"
"instance-state-name": "running"

View file

@ -40,7 +40,7 @@
check_mode: yes
- name: Facts for ec2 test instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-no-wait"
"instance-state-name": "running"
@ -50,7 +50,7 @@
retries: 10
- name: Facts for checkmode ec2 test instance
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-no-wait-checkmode"
"instance-state-name": "running"

View file

@ -115,7 +115,7 @@
retries: 10
- name: remove ENIs
ec2_eni_facts:
ec2_eni_info:
filters:
vpc-id: "{{ testing_vpc.vpc.id }}"
<<: *aws_connection_info

View file

@ -79,7 +79,7 @@
that: 'not remake_in_test_vpc.instances[0].source_dest_check'
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-basic-vpc-create"
"instance-state-name": "running"
@ -87,7 +87,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-basic-vpc-create-checkmode"
"instance-state-name": "running"
@ -113,7 +113,7 @@
<<: *aws_connection_info
register: add_another_tag
- ec2_instance_facts:
- ec2_instance_info:
instance_ids: "{{ add_another_tag.instance_ids }}"
<<: *aws_connection_info
register: check_tags
@ -135,7 +135,7 @@
vpc_subnet_id: "{{ testing_subnet_b.subnet.id }}"
instance_type: t2.micro
<<: *aws_connection_info
- ec2_instance_facts:
- ec2_instance_info:
instance_ids: "{{ add_another_tag.instance_ids }}"
<<: *aws_connection_info
register: check_tags

View file

@ -41,7 +41,7 @@
check_mode: yes
- name: "fact presented ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-protected-instance-in-vpc"
"instance-state-name": "running"
@ -49,7 +49,7 @@
register: presented_instance_fact
- name: "fact checkmode ec2 instance"
ec2_instance_facts:
ec2_instance_info:
filters:
"tag:Name": "{{ resource_prefix }}-test-protected-instance-in-vpc-checkmode"
"instance-state-name": "running"

View file

@ -108,7 +108,7 @@
<<: *aws_connection_info
register: add_another_tag
- ec2_instance_facts:
- ec2_instance_info:
instance_ids: "{{ add_another_tag.instance_ids }}"
<<: *aws_connection_info
register: check_tags
@ -130,7 +130,7 @@
vpc_subnet_id: "{{ testing_subnet_b.subnet.id }}"
instance_type: t2.micro
<<: *aws_connection_info
- ec2_instance_facts:
- ec2_instance_info:
instance_ids: "{{ add_another_tag.instance_ids }}"
<<: *aws_connection_info
register: check_tags

View file

@ -1,5 +1,5 @@
---
# tasks file for test_ec2_vol_facts
# tasks file for test_ec2_vol_info
- name: Set up AWS connection info
set_fact:
aws_connection_info: &aws_connection_info
@ -10,7 +10,7 @@
no_log: true
- block:
- ec2_ami_facts:
- ec2_ami_info:
<<: *aws_connection_info
filters:
architecture: x86_64
@ -21,7 +21,7 @@
- name: Create test instance
ec2_instance:
name: "{{ resource_prefix }}_ansible_ec2_vol_facts_test"
name: "{{ resource_prefix }}_ansible_ec2_vol_info_test"
instance_type: t2.nano
image_id: "{{ (amis.images | sort(attribute='creation_date') | last).image_id }}"
wait: yes
@ -40,7 +40,7 @@
ec2_vol:
instance: "{{ instance.instance_ids[0] }}"
volume_size: 4
name: "{{ resource_prefix }}_ansible_ec2_vol_facts_test.db"
name: "{{ resource_prefix }}_ansible_ec2_vol_info_test.db"
device_name: /dev/xvdf
iops: 100
tags:
@ -50,7 +50,7 @@
register: volume
- name: Gather volume info without any filters
ec2_vol_facts:
ec2_vol_info:
<<: *aws_connection_info
register: volume_facts_wo_filters
check_mode: no
@ -61,10 +61,10 @@
- "volume_facts_wo_filters.volumes is defined"
- name: Gather volume info
ec2_vol_facts:
ec2_vol_info:
<<: *aws_connection_info
filters:
"tag:Name": "{{ resource_prefix }}_ansible_ec2_vol_facts_test.db"
"tag:Name": "{{ resource_prefix }}_ansible_ec2_vol_info_test.db"
register: volume_facts
check_mode: no
@ -84,7 +84,7 @@
- "v.size is defined and v.size == 4"
- "v.snapshot_id is defined and v.snapshot_id == ''"
- "v.status is defined and v.status == 'in-use'"
- "v.tags.Name is defined and v.tags.Name == resource_prefix + '_ansible_ec2_vol_facts_test.db'"
- "v.tags.Name is defined and v.tags.Name == resource_prefix + '_ansible_ec2_vol_info_test.db'"
- "v.tags['Tag Name with Space-and-dash'] == 'Tag Value with Space-and-dash'"
- "v.type is defined and v.type == 'io1'"
- "v.zone is defined and v.zone == instance.instances[0].placement.availability_zone"
@ -104,7 +104,7 @@
ec2_instance:
state: absent
filters:
"tag:Name": "{{ resource_prefix }}_ansible_ec2_vol_facts_test"
"tag:Name": "{{ resource_prefix }}_ansible_ec2_vol_info_test"
<<: *aws_connection_info
register: result
until: result is not failed

View file

@ -124,16 +124,16 @@
register: setup_sg
- name: find a suitable AMI
ec2_ami_facts:
ec2_ami_info:
owner: amazon
filters:
description: "Amazon Linux AMI* ECS *"
<<: *aws_connection_info
register: ec2_ami_facts
register: ec2_ami_info
- name: set image id fact
set_fact:
ecs_image_id: "{{ (ec2_ami_facts.images|first).image_id }}"
ecs_image_id: "{{ (ec2_ami_info.images|first).image_id }}"
- name: provision ec2 instance to create an image
ec2:

View file

@ -44,7 +44,7 @@
register: testing_subnet_b
- name: Get default security group id for vpc
ec2_group_facts:
ec2_group_info:
<<: *aws_connection_info
filters:
vpc-id: "{{ testing_vpc.vpc.id }}"

View file

@ -9,7 +9,7 @@
region: "{{ aws_region }}"
no_log: yes
- ec2_ami_facts:
- ec2_ami_info:
<<: *aws_connection_info
filters:
architecture: x86_64

View file

@ -11,7 +11,7 @@
region: "{{ aws_region }}"
no_log: yes
- ec2_ami_facts:
- ec2_ami_info:
<<: *aws_connection_info
filters:
architecture: x86_64

View file

@ -8,7 +8,7 @@
no_log: yes
- name: get image ID to create an instance
ec2_ami_facts:
ec2_ami_info:
filters:
architecture: x86_64
owner-id: '125523088429'