From d8be6fec65415407e5970ac06fd40e06b5b6af22 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Sun, 19 Apr 2015 17:00:35 +0100 Subject: [PATCH] Consistently use "OracleLinux" in OS detection. Previously, a mixture of "OracleLinux" and "Oracle Linux" was used, causing the `ansible_os_family` fact not to be set to `RedHat`. Fixes #10742. --- lib/ansible/module_utils/facts.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index 4827370c7b..4689dd2da9 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -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