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

Merge pull request #27965 from lyft/HOTFIX-boto-asg-fix

Browse Source 
Fail in boto_asg.present if alarms fail
This commit is contained in:
Mike Place 2015-10-15 06:32:53 -06:00
commit 7006c37627
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/boto_asg.py
View File

@ -567,6 +567,8 @@ def present(
_ret = _alarms_present(name, alarms, alarms_from_pillar, region, key, keyid, profile)
ret['changes'] = dictupdate.update(ret['changes'], _ret['changes'])
ret['comment'] = ' '.join([ret['comment'], _ret['comment']])
if not _ret['result']:
ret['result'] = _ret['result']
return ret