From e04a4a411446ee214cc9837cca33517fa89cd0cb Mon Sep 17 00:00:00 2001 From: HAMSIK Adam Date: Wed, 15 Jul 2015 10:45:38 +0200 Subject: [PATCH] Use mutually_exclusive in AnsibleModule --- lib/ansible/modules/cloud/amazon/ec2_elb_lb.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py b/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py index 5aee07d42fb..a21d27d7b9c 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py +++ b/lib/ansible/modules/cloud/amazon/ec2_elb_lb.py @@ -837,6 +837,7 @@ def main(): module = AnsibleModule( argument_spec=argument_spec, + mutually_exclusive = [['security_group_ids', 'security_group_names']] ) if not HAS_BOTO: @@ -868,9 +869,7 @@ def main(): if state == 'present' and not (zones or subnets): module.fail_json(msg="At least one availability zone or subnet is required for ELB creation") - if security_group_ids and security_group_names: - module.fail_json(msg = str("Use only one type of parameter (security_group_ids) or (security_group_names)")) - elif security_group_names: + if security_group_names: security_group_ids = [] try: ec2 = ec2_connect(module)