archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8146 from rmarchei/8102

Browse Source 
fix get_distribution_version() on amazon linux
reviewable/pr18780/r1
James Cammarata 11 years ago
parent 30a7658b90 ae95ebd075
commit 27b1310ec6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File

6
system/hostname
Unescape Escape View File

@ -299,7 +299,8 @@ 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'
if LooseVersion(get_distribution_version()) >= LooseVersion("7"): distribution_version = get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
strategy_class = RedHatStrategy strategy_class = RedHatStrategy
@ -307,7 +308,8 @@ 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'
if LooseVersion(get_distribution_version()) >= LooseVersion("7"): distribution_version = get_distribution_version()
if distribution_version and LooseVersion(distribution_version) >= LooseVersion("7"):
strategy_class = FedoraStrategy strategy_class = FedoraStrategy
else: else:
strategy_class = RedHatStrategy strategy_class = RedHatStrategy

Write Preview
Loading…
Cancel
Save