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

[cloud] Check instance public-IP property before transforming to dict (#31849)

Browse source
This commit is contained in:
Sloane Hertel 2017-10-18 09:17:06 -04:00 committed by Ryan Brown
parent 598084fbc8
commit 1b63885fc5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/amazon/ec2.py
View file

@ -989,12 +989,12 @@ def enforce_count(module, ec2, vpc):
# ensure all instances are dictionaries # ensure all instances are dictionaries
all_instances = [] all_instances = []
for inst in instances: for inst in instances:
warn_if_public_ip_assignment_changed(module, inst)
if not isinstance(inst, dict): if not isinstance(inst, dict):
inst = get_instance_info(inst) inst = get_instance_info(inst)
all_instances.append(inst) all_instances.append(inst)
warn_if_public_ip_assignment_changed(module, inst)
return (all_instances, instance_dict_array, changed_instance_ids, changed) return (all_instances, instance_dict_array, changed_instance_ids, changed)