wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply changes according to the review

Browse source
This commit is contained in:
Etienne CARRIERE 2015-11-18 06:09:28 +01:00 committed by Matt Clay
parent 292e0a2275
commit 824d57e852
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/ansible/modules/extras/network/f5/bigip_virtual_server.py
View file

@ -253,10 +253,10 @@ def set_snat(api,name,snat):
current_state=get_snat_type(api,name) current_state=get_snat_type(api,name)
if snat is None: if snat is None:
return updated return updated
if snat == 'None' and current_state != 'SRC_TRANS_NONE': elif snat == 'None' and current_state != 'SRC_TRANS_NONE':
api.LocalLB.VirtualServer.set_source_address_translation_none(virtual_servers = [name]) api.LocalLB.VirtualServer.set_source_address_translation_none(virtual_servers = [name])
updated = True updated = True
if snat == 'Automap' and current_state != 'SRC_TRANS_AUTOMAP': elif snat == 'Automap' and current_state != 'SRC_TRANS_AUTOMAP':
api.LocalLB.VirtualServer.set_source_address_translation_automap(virtual_servers = [name]) api.LocalLB.VirtualServer.set_source_address_translation_automap(virtual_servers = [name])
updated = True updated = True
return updated return updated
@ -386,21 +386,21 @@ def main():
result = {'changed': False} # default result = {'changed': False} # default
if state == 'absent': if state == 'absent':
if not module.check_mode: if not module.check_mode:
if vs_exists(api,name): if vs_exists(api,name):
# hack to handle concurrent runs of module # hack to handle concurrent runs of module
# pool might be gone before we actually remove # pool might be gone before we actually remove
try: try:
vs_remove(api,name) vs_remove(api,name)
result = {'changed' : True, 'deleted' : name } result = {'changed' : True, 'deleted' : name }
except bigsuds.OperationFailed, e: except bigsuds.OperationFailed, e:
if "was not found" in str(e): if "was not found" in str(e):
result['changed']= False result['changed']= False
else: else:
raise raise
else: else:
# check-mode return value # check-mode return value
result = {'changed': True} result = {'changed': True}
elif state == 'present': elif state == 'present':
update = False update = False
@ -409,8 +409,8 @@ def main():
module.fail_json(msg="both destination and port must be supplied to create a VS") module.fail_json(msg="both destination and port must be supplied to create a VS")
if not module.check_mode: if not module.check_mode:
# a bit of a hack to handle concurrent runs of this module. # a bit of a hack to handle concurrent runs of this module.
# even though we've checked the pool doesn't exist, # even though we've checked the virtual_server doesn't exist,
# it may exist by the time we run create_pool(). # it may exist by the time we run virtual_server().
# this catches the exception and does something smart # this catches the exception and does something smart
# about it! # about it!
try: try:
@ -421,7 +421,7 @@ def main():
set_default_persistence_profiles(api,name,default_persistence_profile) set_default_persistence_profiles(api,name,default_persistence_profile)
result = {'changed': True} result = {'changed': True}
except bigsuds.OperationFailed, e: except bigsuds.OperationFailed, e:
raise Exception('Error on creating Virtual Server : %s' % e) raise Exception('Error on creating Virtual Server : %s' % e)
else: else:
# check-mode return value # check-mode return value
result = {'changed': True} result = {'changed': True}