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

minor fixes in two modules (#58178)

Browse source
This commit is contained in:
Wojciech Wypior 2019-06-21 15:07:18 +01:00 committed by Tim Rupp
parent 3531bf3148
commit 07fc880b3c
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/network/f5/bigip_selfip.py
View file

@ -696,7 +696,7 @@ class ModuleManager(object):
elif 'default' in self.want.allow_service: elif 'default' in self.want.allow_service:
self.want.update(dict(allow_service=['default'])) self.want.update(dict(allow_service=['default']))
self._set_changed_options() self._set_changed_options()
if self.want.check_mode: if self.module.check_mode:
return True return True
self.create_on_device() self.create_on_device()
if self.exists(): if self.exists():

5
lib/ansible/modules/network/f5/bigip_virtual_server.py
View file

@ -870,7 +870,6 @@ clone_pools:
type: list type: list
sample: [{'pool_name':'/Common/Pool1', 'context': 'clientside'}] sample: [{'pool_name':'/Common/Pool1', 'context': 'clientside'}]
''' '''
import os import os
import re import re
@ -1772,7 +1771,7 @@ class ModuleParameters(Parameters):
if len(result) > 1: if len(result) > 1:
pattern = r'^[a-zA-Z0-9_.-]+' pattern = r'^[a-zA-Z0-9_.-]+'
matches = re.search(pattern, result[0]) matches = re.search(pattern, result[0])
if matches and not is_valid_ip(matches.group(0)): if matches and not is_valid_ip(result[0]):
# we need to strip RD because when using Virtual Address names the RD is not needed. # we need to strip RD because when using Virtual Address names the RD is not needed.
return None return None
return int(result[1]) return int(result[1])
@ -3619,8 +3618,6 @@ def main():
mutually_exclusive=spec.mutually_exclusive mutually_exclusive=spec.mutually_exclusive
) )
client = F5RestClient(**module.params)
try: try:
mm = ModuleManager(module=module) mm = ModuleManager(module=module)
results = mm.exec_module() results = mm.exec_module()