cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ec2_elb_facts: fix errors with no names input (#3381)

Browse source 
* None being passed around results in a Bad Time (tm)

* need to return the full set of elbs for an empty list

* logic is hard
This commit is contained in:
mattwwarren 2016-11-11 16:02:07 -05:00 committed by Matt Clay
parent 14fee8d5f7
commit 727e533bfc
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/modules/extras/cloud/amazon/ec2_elb_facts.py
View file

@ -203,16 +203,19 @@ class ElbInformation(object):
self.module.fail_json(msg = "%s: %s" % (err.error_code, err.error_message)) self.module.fail_json(msg = "%s: %s" % (err.error_code, err.error_message))
if all_elbs: if all_elbs:
for existing_lb in all_elbs: if self.names:
if existing_lb.name in self.names: for existing_lb in all_elbs:
elb_array.append(self._get_elb_info(existing_lb)) if existing_lb.name in self.names:
elb_array.append(existing_lb)
return elb_array else:
elb_array = all_elbs
return list(map(self._get_elb_info, elb_array))
def main(): def main():
argument_spec = ec2_argument_spec() argument_spec = ec2_argument_spec()
argument_spec.update(dict( argument_spec.update(dict(
names={'default': None, 'type': 'list'} names={'default': [], 'type': 'list'}
) )
) )
module = AnsibleModule(argument_spec=argument_spec) module = AnsibleModule(argument_spec=argument_spec)