diff options
| author | Michael Scherer <misc@zarb.org> | 2014-12-14 21:54:30 +0100 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-02-17 14:38:06 -0600 |
| commit | 0cdd237368c7e9a0b03654f3d2a55e9b2b81cc50 (patch) | |
| tree | a9777fac167179271613a7a67142e54a0c7bc6cb | |
| parent | 21f2e1554df1b1497554b0ec2598bba7083713e7 (diff) | |
| download | ansible-modules-core-0cdd237368c7e9a0b03654f3d2a55e9b2b81cc50.tar.gz | |
Revert commit cbc417c, as the code is broken, see #438
LooseVersion expect a string, so filtering to return a int
is incorrect. Thanks to Jeremy Brown for the analysis.
| -rw-r--r-- | system/hostname.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/system/hostname.py b/system/hostname.py index 95b28dbf..0c9e0a02 100644 --- a/system/hostname.py +++ b/system/hostname.py @@ -45,18 +45,6 @@ from distutils.version import LooseVersion from ansible.module_utils.basic import * -# wrap get_distribution_version in case it returns a string -def _get_distribution_version(): - distribution_version = get_distribution_version() - - if type(distribution_version) is str: - distribution_version = 0 - elif type(distribution_version) is None: - distribution_version = 0 - - return distribution_version - - class UnimplementedStrategy(object): def __init__(self, module): self.module = module @@ -353,7 +341,7 @@ class RedHat5Hostname(Hostname): class RedHatServerHostname(Hostname): platform = 'Linux' distribution = 'Red hat enterprise linux server' - distribution_version = _get_distribution_version() + distribution_version = get_distribution_version() if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): strategy_class = FedoraStrategy else: @@ -362,7 +350,7 @@ class RedHatServerHostname(Hostname): class RedHatWorkstationHostname(Hostname): platform = 'Linux' distribution = 'Red hat enterprise linux workstation' - distribution_version = _get_distribution_version() + distribution_version = get_distribution_version() if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): strategy_class = FedoraStrategy else: @@ -371,7 +359,7 @@ class RedHatWorkstationHostname(Hostname): class CentOSHostname(Hostname): platform = 'Linux' distribution = 'Centos' - distribution_version = _get_distribution_version() + distribution_version = get_distribution_version() if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): strategy_class = FedoraStrategy else: @@ -380,7 +368,7 @@ class CentOSHostname(Hostname): class CentOSLinuxHostname(Hostname): platform = 'Linux' distribution = 'Centos linux' - distribution_version = _get_distribution_version() + distribution_version = get_distribution_version() if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): strategy_class = FedoraStrategy else: |