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

Revert commit cbc417c, as the code is broken, see #438

Browse source 
LooseVersion expect a string, so filtering to return a int
is incorrect. Thanks to Jeremy Brown for the analysis.
This commit is contained in:
Michael Scherer 2014-12-14 21:54:30 +01:00 committed by Matt Clay
parent 7fbb422ae7
commit 104f91ed3b
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/ansible/modules/system/hostname.py
View file

@ -45,18 +45,6 @@ from distutils.version import LooseVersion
from ansible.module_utils.basic import * 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): class UnimplementedStrategy(object):
def __init__(self, module): def __init__(self, module):
self.module = module self.module = module
@ -353,7 +341,7 @@ class RedHat5Hostname(Hostname):
class RedHatServerHostname(Hostname): class RedHatServerHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Red hat enterprise linux server' 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"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
@ -362,7 +350,7 @@ class RedHatServerHostname(Hostname):
class RedHatWorkstationHostname(Hostname): class RedHatWorkstationHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Red hat enterprise linux workstation' 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"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
@ -371,7 +359,7 @@ class RedHatWorkstationHostname(Hostname):
class CentOSHostname(Hostname): class CentOSHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Centos' distribution = 'Centos'
distribution_version = _get_distribution_version() distribution_version = get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
@ -380,7 +368,7 @@ class CentOSHostname(Hostname):
class CentOSLinuxHostname(Hostname): class CentOSLinuxHostname(Hostname):
platform = 'Linux' platform = 'Linux'
distribution = 'Centos linux' distribution = 'Centos linux'
distribution_version = _get_distribution_version() distribution_version = get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"): if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else: