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

Fixes for __states__ calls

Browse Source
This commit is contained in:
Ryan Lane 2015-09-28 16:31:51 -07:00
parent 603c9ede49
commit 4cdf9e2824
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/states/boto_asg.py
View File

@ -442,7 +442,6 @@ def present(
args.update(d) args.update(d)
if not __opts__['test']: if not __opts__['test']:
lc_ret = __states__['boto_lc.present'](**args) lc_ret = __states__['boto_lc.present'](**args)
lc_ret = lc_ret.values()[0]
if lc_ret['result'] is True and lc_ret['changes']: if lc_ret['result'] is True and lc_ret['changes']:
if 'launch_config' not in ret['changes']: if 'launch_config' not in ret['changes']:
ret['changes']['launch_config'] = {} ret['changes']['launch_config'] = {}
@ -713,8 +712,7 @@ def _alarms_present(name, min_size_equals_max_size, alarms, alarms_from_pillar,
'keyid': keyid, 'keyid': keyid,
'profile': profile, 'profile': profile,
} }
ret = __states__['boto_cloudwatch_alarm.present'](**kwargs) results = __states__['boto_cloudwatch_alarm.present'](**kwargs)
results = ret.values()[0]
if not results['result']: if not results['result']:
merged_return_value['result'] = False merged_return_value['result'] = False
if results.get('changes', {}) != {}: if results.get('changes', {}) != {}: