From 5e25454fc11907ac0990e65017bd1791dedbfdc2 Mon Sep 17 00:00:00 2001 From: Ryan Lane Date: Mon, 28 Sep 2015 16:36:28 -0700 Subject: [PATCH] Followups for using __states__ --- salt/states/boto_asg.py | 4 +--- salt/states/boto_elb.py | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/salt/states/boto_asg.py b/salt/states/boto_asg.py index cf44fd134c..8a2dd4f878 100644 --- a/salt/states/boto_asg.py +++ b/salt/states/boto_asg.py @@ -409,7 +409,6 @@ def present( args.update(cfg) if not __opts__['test']: lc_ret = __states__['boto_lc.present'](**args) - lc_ret = next(six.itervalues(lc_ret)) if lc_ret['result'] is True and lc_ret['changes']: if 'launch_config' not in ret['changes']: ret['changes']['launch_config'] = {} @@ -612,8 +611,7 @@ def _alarms_present(name, alarms, alarms_from_pillar, region, key, keyid, profil 'keyid': keyid, 'profile': profile, } - ret = __states__['boto_cloudwatch_alarm.present'](**kwargs) - results = next(six.itervalues(ret)) + results = __states__['boto_cloudwatch_alarm.present'](**kwargs) if not results['result']: merged_return_value['result'] = False if results.get('changes', {}) != {}: diff --git a/salt/states/boto_elb.py b/salt/states/boto_elb.py index c5b84d1a62..754ba94a07 100644 --- a/salt/states/boto_elb.py +++ b/salt/states/boto_elb.py @@ -347,7 +347,6 @@ def present( keyid=keyid, profile=profile ) - _ret = _ret.values()[0] ret['changes'] = dictupdate.update(ret['changes'], _ret['changes']) ret['comment'] = ' '.join([ret['comment'], _ret['comment']]) if not _ret['result']: @@ -911,8 +910,7 @@ def _alarms_present(name, alarms, alarms_from_pillar, region, key, keyid, profil "keyid": keyid, "profile": profile, } - ret = __states__['boto_cloudwatch_alarm.present'](**kwargs) - results = next(six.itervalues(ret)) + results = __states__['boto_cloudwatch_alarm.present'](**kwargs) if not results["result"]: merged_return_value["result"] = results["result"] if results.get("changes", {}) != {}: