diff options
| author | John R Barker <john@johnrbarker.com> | 2017-04-05 14:49:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 14:49:01 +0100 |
| commit | ac9bb4df8ed15ff6e6feb37ca6ec0bcb8aa26188 (patch) | |
| tree | ae64d34ce54039813018d9ad10f071c757cc889a | |
| parent | dbe83cc09984ad27e778caebe4ccdcf585f44c4f (diff) | |
| download | ansible-ac9bb4df8ed15ff6e6feb37ca6ec0bcb8aa26188.tar.gz | |
Fixes pylint errors (#23279) (#23295)
Reported by gundalow, this fixes pylint errors in F5 modules
(cherry picked from commit 780b2f2c84d9dd3ebec2e7bcd487e4e8434a9a1c)
| -rw-r--r-- | lib/ansible/modules/network/f5/bigip_gtm_datacenter.py | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/network/f5/bigip_routedomain.py | 18 | ||||
| -rw-r--r-- | lib/ansible/modules/network/f5/bigip_ssl_certificate.py | 2 |
3 files changed, 9 insertions, 13 deletions
diff --git a/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py b/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py index a3b9a01137..08f69cbdfb 100644 --- a/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py +++ b/lib/ansible/modules/network/f5/bigip_gtm_datacenter.py @@ -320,7 +320,7 @@ class BigIpGtmDatacenter(object): enabled = self.params['enabled'] if state is None and enabled is None: - module.fail_json(msg="Neither 'state' nor 'enabled' set") + raise F5ModuleError("Neither 'state' nor 'enabled' set") try: if state == "present": diff --git a/lib/ansible/modules/network/f5/bigip_routedomain.py b/lib/ansible/modules/network/f5/bigip_routedomain.py index 4f5c153801..d4c970cbce 100644 --- a/lib/ansible/modules/network/f5/bigip_routedomain.py +++ b/lib/ansible/modules/network/f5/bigip_routedomain.py @@ -476,18 +476,12 @@ class BigIpRouteDomain(object): result = dict() state = self.params['state'] - if self.params['check_mode']: - if value == current: - changed = False - else: - changed = True - else: - if state == "present": - changed = self.present() - current = self.read() - result.update(current) - elif state == "absent": - changed = self.absent() + if state == "present": + changed = self.present() + current = self.read() + result.update(current) + elif state == "absent": + changed = self.absent() result.update(dict(changed=changed)) return result diff --git a/lib/ansible/modules/network/f5/bigip_ssl_certificate.py b/lib/ansible/modules/network/f5/bigip_ssl_certificate.py index 2aa6c45321..52dd836d69 100644 --- a/lib/ansible/modules/network/f5/bigip_ssl_certificate.py +++ b/lib/ansible/modules/network/f5/bigip_ssl_certificate.py @@ -444,6 +444,8 @@ class BigIpSslCertificate(object): def delete(self): changed = False + name = self.params['name'] + partition = self.params['partition'] check_mode = self.params['check_mode'] |