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

Fixes bigip gtm params (#34544)

Browse source 
Changed bool params to be string params because there is a third
param that needs to be taken into account
This commit is contained in:
Tim Rupp 2018-01-06 19:36:02 -08:00 committed by GitHub
parent 8465830c1d
commit 8e5407e0da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/network/f5/bigip_gtm_server.py
View file

@ -83,8 +83,9 @@ options:
- Specifies whether the system auto-discovers the links for this server. When - Specifies whether the system auto-discovers the links for this server. When
creating a new GTM server, if this parameter is not specified, the default creating a new GTM server, if this parameter is not specified, the default
value C(disabled) is used. value C(disabled) is used.
- If you set this parameter to C(enabled), you must also ensure that the - If you set this parameter to C(enabled) or C(enabled-no-delete), you must
C(virtual_server_discovery) parameter is also set to C(enabled). also ensure that the C(virtual_server_discovery) parameter is also set to
C(enabled) or C(enabled-no-delete).
choices: choices:
- enabled - enabled
- disabled - disabled
@ -125,7 +126,7 @@ EXAMPLES = r'''
datacenter: /Common/New York datacenter: /Common/New York
server_type: bigip server_type: bigip
link_discovery: disabled link_discovery: disabled
virtual_server_discovery: no virtual_server_discovery: disabled
devices: devices:
- {'name': 'server_1', 'address': '1.1.1.1'} - {'name': 'server_1', 'address': '1.1.1.1'}
- {'name': 'server_2', 'address': '2.2.2.1', 'translation':'192.168.2.1'} - {'name': 'server_2', 'address': '2.2.2.1', 'translation':'192.168.2.1'}
@ -143,7 +144,7 @@ EXAMPLES = r'''
datacenter: /Common/New York datacenter: /Common/New York
server_type: bigip server_type: bigip
link_discovery: disabled link_discovery: disabled
virtual_server_discovery: no virtual_server_discovery: disabled
devices: devices:
- name: server_1 - name: server_1
address: 1.1.1.1 address: 1.1.1.1
@ -430,7 +431,7 @@ class Difference(object):
else: else:
link_discovery = self.want.link_discovery link_discovery = self.want.link_discovery
if link_discovery == 'enabled' and virtual_server_discovery == 'disabled': if link_discovery in ['enabled', 'enabled-no-delete'] and virtual_server_discovery == 'disabled':
raise F5ModuleError( raise F5ModuleError(
"Virtual server discovery must be enabled if link discovery is enabled" "Virtual server discovery must be enabled if link discovery is enabled"
) )
@ -648,7 +649,7 @@ class BaseManager(object):
) )
def _check_link_discovery_requirements(self): def _check_link_discovery_requirements(self):
if self.want.link_discovery == 'enabled' and self.want.virtual_server_discovery == 'disabled': if self.want.link_discovery in ['enabled', 'enabled-no-delete'] and self.want.virtual_server_discovery == 'disabled':
raise F5ModuleError( raise F5ModuleError(
"Virtual server discovery must be enabled if link discovery is enabled" "Virtual server discovery must be enabled if link discovery is enabled"
) )