valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18644 from rallytime/boto_asg_fix

Browse Source 
If the asg does not exist in the region provided, don't return True.
This commit is contained in:
Thomas S Hatch 2014-12-03 20:55:11 -07:00
commit 0bed869f1f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
salt/modules/boto_asg.py
View File

@ -78,8 +78,13 @@ def exists(name, region=None, key=None, keyid=None, profile=None):
if not conn:
return False
try:
conn.get_all_groups(names=[name])
return True
_conn = conn.get_all_groups(names=[name])
if _conn:
return True
else:
msg = 'The autoscale group does not exist in region {0}'.format(region)
log.debug(msg)
return False
except boto.exception.BotoServerError as e:
log.debug(e)
return False
@ -385,10 +390,16 @@ def launch_configuration_exists(name, region=None, key=None, keyid=None,
conn = _get_conn(region, key, keyid, profile)
if not conn:
return False
lc = conn.get_all_launch_configurations(names=[name])
if lc:
return True
else:
try:
lc = conn.get_all_launch_configurations(names=[name])
if lc:
return True
else:
msg = 'The launch configuration does not exist in region {0}'.format(region)
log.debug(msg)
return False
except boto.exception.BotoServerError as e:
log.debug(e)
return False