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

Check for Rules before removing. (#28731)

Browse source
This commit is contained in:
mestudd 2017-08-29 12:07:07 -04:00 committed by Sam Doran
parent c97f4653be
commit 7b8f113ceb
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/cloud/amazon/elb_application_lb.py
View file

@ -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: