From 6e6a6ff36b6dbb5f92d5ac8238dbe280624fcca8 Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Sat, 14 Oct 2017 15:39:18 -0700 Subject: [PATCH] Fixes an fqdn error (#31745) the pool module was not correctly interpreting the partitions in the monitors list vs the partition at the task level. This patch fixes that. --- lib/ansible/modules/network/f5/bigip_pool.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/network/f5/bigip_pool.py b/lib/ansible/modules/network/f5/bigip_pool.py index 4e05e8b215..b87ba1e0f3 100644 --- a/lib/ansible/modules/network/f5/bigip_pool.py +++ b/lib/ansible/modules/network/f5/bigip_pool.py @@ -110,7 +110,7 @@ options: default: Common version_added: 2.5 notes: - - Requires BIG-IP software version >= 11. + - Requires BIG-IP software version >= 12. - F5 developed module 'F5-SDK' required (https://github.com/F5Networks/f5-common-python). - Best run as a local_action in your playbook. requirements: @@ -399,12 +399,9 @@ class Parameters(AnsibleF5Parameters): return lb_method def _fqdn_name(self, value): - if value.startswith('/'): - name = os.path.basename(value) - result = '/{0}/{1}'.format(self.partition, name) - else: - result = '/{0}/{1}'.format(self.partition, value) - return result + if value is not None and not value.startswith('/'): + return '/{0}/{1}'.format(self.partition, value) + return value @property def monitors_list(self):