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

improve changed result for race conditions

Browse source
This commit is contained in:
Serge van Ginderachter 2013-09-03 22:00:43 +02:00
parent 0c2e376d5e
commit f79c9fb6ce
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/net_infrastructure/bigip_monitor_http
View file

@ -182,10 +182,11 @@ def create_monitor(api, monitor, template_attributes):
api.LocalLB.Monitor.create_template(templates=[{'template_name': monitor, 'template_type': TEMPLATE_TYPE}], template_attributes=[template_attributes])
except bigsuds.OperationFailed, e:
if "already exists" in str(e):
pass
return False
else:
# genuine exception
raise
return True
def delete_monitor(api, monitor):
@ -194,9 +195,12 @@ def delete_monitor(api, monitor):
api.LocalLB.Monitor.delete_template(template_names=[monitor])
except bigsuds.OperationFailed, e:
# maybe it was deleted since we checked
if not "was not found" in str(e):
if "was not found" in str(e):
return False
else:
# genuine exception
raise
return True
def check_string_property(api, monitor, str_property):
@ -307,8 +311,11 @@ def main():
if state == 'absent':
if monitor_exists:
if not module.check_mode:
delete_monitor(api, monitor)
result['changed'] = True
# possible race condition if same task
# on other node deleted it first
result['changed'] = delete_monitor(api, monitor)
else:
result['changed'] = True
else:
ipport = {'address_type': address_type,
@ -353,10 +360,13 @@ def main():
result['changed'] = True
elif not module.check_mode:
create_monitor(api, monitor, template_attributes)
# possible race condition if same task
# on other node deleted it first
result['changed'] = create_monitor(api, monitor, template_attributes)
for str_property in template_string_properties:
set_string_property(api, monitor, str_property)
result['changed'] = True
for int_property in template_integer_properties:
set_integer_property(api, monitor, int_property)
else: # monitor does not exist and check mode
result['changed'] = True