a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ec2: fix instids and res_list being referenced before assigned - fixes #22692 (#23053) 

* add else statement to ensure instids is set

set res_list to None to avoid UnboundLocalError and fix iteration over a nonetype by adding an empty tuple

* make res_list empty tuple by default and check for instids before setting tags (fails otherwise)
pull/4420/head
Sloane Hertel 2017-03-29 20:18:23 -04:00 committed by GitHub
parent c1b3d6a51f
commit 44b2859338
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ansible/modules/cloud/amazon/ec2.py
View File

@ -1227,12 +1227,15 @@ def create_instances(module, ec2, vpc, override_count=None):
# Now we have to do the intermediate waiting # Now we have to do the intermediate waiting
if wait: if wait:
instids = await_spot_requests(module, ec2, res, count) instids = await_spot_requests(module, ec2, res, count)
else:
instids = []
except boto.exception.BotoServerError as e: except boto.exception.BotoServerError as e:
module.fail_json(msg="Instance creation failed => %s: %s" % (e.error_code, e.error_message)) module.fail_json(msg="Instance creation failed => %s: %s" % (e.error_code, e.error_message))
# wait here until the instances are up # wait here until the instances are up
num_running = 0 num_running = 0
wait_timeout = time.time() + wait_timeout wait_timeout = time.time() + wait_timeout
res_list = ()
while wait_timeout > time.time() and num_running < len(instids): while wait_timeout > time.time() and num_running < len(instids):
try: try:
res_list = ec2.get_all_instances(instids) res_list = ec2.get_all_instances(instids)
@ -1275,7 +1278,7 @@ def create_instances(module, ec2, vpc, override_count=None):
inst.modify_attribute('disableApiTermination', True) inst.modify_attribute('disableApiTermination', True)
# Leave this as late as possible to try and avoid InvalidInstanceID.NotFound # Leave this as late as possible to try and avoid InvalidInstanceID.NotFound
if instance_tags: if instance_tags and instids:
try: try:
ec2.create_tags(instids, instance_tags) ec2.create_tags(instids, instance_tags)
except boto.exception.EC2ResponseError as e: except boto.exception.EC2ResponseError as e: