Skip to content

Commit

Permalink
Fixes an fqdn error (ansible#31745)
Browse files Browse the repository at this point in the history
the pool module was not correctly interpreting the partitions
in the monitors list vs the partition at the task level. This patch
fixes that.
  • Loading branch information
caphrim007 authored Oct 14, 2017
1 parent 02cd881 commit 6e6a6ff
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions lib/ansible/modules/network/f5/bigip_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
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:
Expand Down Expand Up @@ -399,12 +399,9 @@ def lb_method(self):
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):
Expand Down

0 comments on commit 6e6a6ff

Please sign in to comment.