wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #10789 from mavit/oracle_linux_os_family

Browse source 
Consistently use "OracleLinux" in OS detection.
This commit is contained in:
Brian Coca 2015-04-20 18:50:57 -04:00
commit 2a59f27db4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/module_utils/facts.py
View file

@ -87,7 +87,7 @@ class Facts(object):
_I386RE = re.compile(r'i([3456]86|86pc)')
# For the most part, we assume that platform.dist() will tell the truth.
# This is the fallback to handle unknowns or exceptions
OSDIST_LIST = ( ('/etc/oracle-release', 'Oracle Linux'),
OSDIST_LIST = ( ('/etc/oracle-release', 'OracleLinux'),
('/etc/redhat-release', 'RedHat'),
('/etc/vmware-release', 'VMwareESX'),
('/etc/openwrt_release', 'OpenWrt'),
@ -297,7 +297,7 @@ class Facts(object):
# Once we determine the value is one of these distros
# we trust the values are always correct
break
elif name == 'Oracle Linux':
elif name == 'OracleLinux':
data = get_file_content(path)
if 'Oracle Linux' in data:
self.facts['distribution'] = name