diff options
author | mattwwarren <mattwwarren@users.noreply.github.com> | 2016-11-11 16:02:07 -0500 |
---|---|---|
committer | René Moser <mail@renemoser.net> | 2016-11-11 22:02:07 +0100 |
commit | 2fb062604f9b809ab6d12888ed84cfc39267a112 (patch) | |
tree | fbad1a575f560c087a17142028139bfc6c03b932 /cloud/amazon | |
parent | 96a7c3782bf99cfa79aa1a2f8bd7bc467b9163a1 (diff) | |
download | ansible-modules-extras-2fb062604f9b809ab6d12888ed84cfc39267a112.tar.gz |
ec2_elb_facts: fix errors with no names input (#3381)
* 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
Diffstat (limited to 'cloud/amazon')
-rw-r--r-- | cloud/amazon/ec2_elb_facts.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cloud/amazon/ec2_elb_facts.py b/cloud/amazon/ec2_elb_facts.py index 52da210f..122e0f70 100644 --- a/cloud/amazon/ec2_elb_facts.py +++ b/cloud/amazon/ec2_elb_facts.py @@ -205,16 +205,19 @@ class ElbInformation(object): self.module.fail_json(msg = "%s: %s" % (err.error_code, err.error_message)) if all_elbs: - for existing_lb in all_elbs: - if existing_lb.name in self.names: - elb_array.append(self._get_elb_info(existing_lb)) - - return elb_array + if self.names: + for existing_lb in all_elbs: + if existing_lb.name in self.names: + elb_array.append(existing_lb) + else: + elb_array = all_elbs + + return list(map(self._get_elb_info, elb_array)) def main(): argument_spec = ec2_argument_spec() argument_spec.update(dict( - names={'default': None, 'type': 'list'} + names={'default': [], 'type': 'list'} ) ) module = AnsibleModule(argument_spec=argument_spec) |