valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update boto_ec2.find_instances() to always return values as described… (#32812)

Browse Source 
* Update boto_ec2.find_instances() to always return values as described in docstring.

* Fixup logic flow - instance creation was aborting in certain cases when an instance with the same name had been terminated but still showed in boto_ec2.exists()
This commit is contained in:
Tom Williams 2016-04-25 12:35:51 -04:00 committed by Nicole Thomas
parent 2296fb2a67
commit 7744d83526
2 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/boto_ec2.py
View File

@ -453,8 +453,6 @@ def find_instances(instance_id=None, name=None, tags=None, region=None,
'''
conn = _get_conn(region=region, key=key, keyid=keyid, profile=profile)
if not any((instance_id, name, tags)):
return []
try:
filter_parameters = {'filters': {}}

41
salt/states/boto_ec2.py
View File

@ -754,41 +754,32 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None,
if (public_ip or allocation_id or allocate_eip) and not exactly_one((public_ip, allocation_id, allocate_eip)):
raise SaltInvocationError('At most one of public_ip, allocation_id OR '
'allocate_eip may be provided.')
if not instance_id:
try:
instance_id = __salt__['boto_ec2.get_id'](name=instance_name if instance_name else name,
tags=tags, region=region, key=key, keyid=keyid,
profile=profile, in_states=running_states)
except CommandExecutionError as e:
ret['result'] = None
ret['comment'] = 'Couldn\'t determine current status of instance {0}.'.format(instance_name)
return ret
exists = __salt__['boto_ec2.exists'](instance_id=instance_id, region=region,
key=key, keyid=keyid, profile=profile)
if not exists:
_create = True
if instance_id:
exists = __salt__['boto_ec2.exists'](instance_id=instance_id, region=region, key=key,
keyid=keyid, profile=profile, in_states=running_states)
if not exists:
_create = True
else:
instances = __salt__['boto_ec2.find_instances'](instance_id=instance_id, region=region,
key=key, keyid=keyid, profile=profile,
return_objs=True, in_states=running_states)
instances = __salt__['boto_ec2.find_instances'](name=instance_name if instance_name else name,
region=region, key=key, keyid=keyid, profile=profile,
in_states=running_states)
if not len(instances):
_create = True
if image_name:
args = {'ami_name': image_name, 'region': region, 'key': key,
'keyid': keyid, 'profile': profile}
image_ids = __salt__['boto_ec2.find_images'](**args)
if len(image_ids):
image_id = image_ids[0]
else:
image_id = image_name
if _create:
if __opts__['test']:
ret['comment'] = 'The instance {0} is set to be created.'.format(name)
ret['result'] = None
return ret
if image_name:
args = {'ami_name': image_name, 'region': region, 'key': key,
'keyid': keyid, 'profile': profile}
image_ids = __salt__['boto_ec2.find_images'](**args)
if len(image_ids):
image_id = image_ids[0]
else:
image_id = image_name
r = __salt__['boto_ec2.run'](image_id, instance_name if instance_name else name,
tags=tags, key_name=key_name,
security_groups=security_groups, user_data=user_data,