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

Fixes bugs in the bigip_software modules (#45577)

Browse source 
This patch makes hotfix code work, where before, only base images
were working

(cherry picked from commit e266a24263)
This commit is contained in:
Tim Rupp 2018-09-12 15:56:43 -04:00 committed by Toshio Kuratomi
parent 186f4effd3
commit 25349b89dd
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/network/f5/bigip_software_image.py
View file

@ -285,7 +285,7 @@ class ModuleManager(object):
return self.create()
def exists(self):
if self.image_exists() or self.image_exists():
if self.image_exists() or self.hotfix_exists():
return True
return False
@ -408,7 +408,7 @@ class ModuleManager(object):
except ValueError as ex:
raise F5ModuleError(str(ex))
if 'code' in response and response['code'] == 400:
if 'code' in response and response['code'] in [400, 404]:
if 'message' in response:
raise F5ModuleError(response['message'])
else:
@ -438,7 +438,7 @@ class ModuleManager(object):
response = self.client.api.delete(uri)
if response.status == 200:
return True
if 'code' in response and response['code'] == 400:
if 'code' in response and response['code'] in [400, 404]:
if 'message' in response:
raise F5ModuleError(response['message'])
else:

9
lib/ansible/modules/network/f5/bigip_software_install.py
View file

@ -188,7 +188,7 @@ class ModuleParameters(Parameters):
image = self.read_image_from_device(type='image')
if image:
return image
image = self.read_hotfix_from_device(type='hotfix')
image = self.read_image_from_device(type='hotfix')
if image:
return image
return None
@ -206,11 +206,8 @@ class ModuleParameters(Parameters):
except ValueError:
return None
if 'code' in response and response['code'] == 400:
if 'message' in response:
return None
else:
return None
if 'code' in response and response['code'] in [400, 404]:
return None
return response