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

This commit is contained in:
Sloane Hertel 2017-10-18 09:17:06 -04:00 committed by Ryan Brown
parent 598084fbc8
commit 1b63885fc5

View file

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