From 7b8f113ceb0a2846651da9b5da88f15e9b58b2ff Mon Sep 17 00:00:00 2001 From: mestudd Date: Tue, 29 Aug 2017 12:07:07 -0400 Subject: [PATCH] Check for Rules before removing. (#28731) --- lib/ansible/modules/cloud/amazon/elb_application_lb.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/elb_application_lb.py b/lib/ansible/modules/cloud/amazon/elb_application_lb.py index eb88056058..e5cdcac220 100644 --- a/lib/ansible/modules/cloud/amazon/elb_application_lb.py +++ b/lib/ansible/modules/cloud/amazon/elb_application_lb.py @@ -717,7 +717,8 @@ def create_or_update_elb_listeners(connection, module, elb): try: listener_to_add['LoadBalancerArn'] = elb['LoadBalancerArn'] # Rules is not a valid parameter for create_listener - listener_to_add.pop('Rules') + if 'Rules' in listener_to_add: + listener_to_add.pop('Rules') response = connection.create_listener(**listener_to_add) # Add the new listener current_listeners.append(response['Listeners'][0]) @@ -729,7 +730,8 @@ def create_or_update_elb_listeners(connection, module, elb): for listener_to_modify in listeners_to_modify: try: # Rules is not a valid parameter for modify_listener - listener_to_modify.pop('Rules') + if 'Rules' in listener_to_modify: + listener_to_modify.pop('Rules') connection.modify_listener(**listener_to_modify) listener_changed = True except ClientError as e: