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

[cloud] Only enforce state (running/stopped/etc) in EC2 "exact_count" when state is specified (#31648)

Browse source 
fix issue in ec2 module where exact count would create new instances if the instane state is stopped or terminated
This commit is contained in:
Sloane Hertel 2017-10-13 14:11:07 -04:00 committed by Ryan Brown
parent 90b6178e61
commit 53e476ad4e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -639,13 +639,18 @@ except ImportError:
def find_running_instances_by_count_tag(module, ec2, vpc, count_tag, zone=None): def find_running_instances_by_count_tag(module, ec2, vpc, count_tag, zone=None):
# get reservations for instances that match tag(s) and are running # get reservations for instances that match tag(s) and are in the desired state
reservations = get_reservations(module, ec2, vpc, tags=count_tag, state="running", zone=zone) state = module.params.get('state')
if state not in ['running', 'stopped']:
state = None
reservations = get_reservations(module, ec2, vpc, tags=count_tag, state=state, zone=zone)
instances = [] instances = []
for res in reservations: for res in reservations:
if hasattr(res, 'instances'): if hasattr(res, 'instances'):
for inst in res.instances: for inst in res.instances:
if inst.state == 'terminated':
continue
instances.append(inst) instances.append(inst)
return reservations, instances return reservations, instances