From 9202ef60b02053e5b5e6224cc4b5fc9c4c8786b0 Mon Sep 17 00:00:00 2001 From: Josue David Hernandez Date: Tue, 11 Dec 2018 15:12:38 -0600 Subject: [PATCH] set ansible_os_family from name variable in os-release for clearlinux OS (#49639) * set ansible_os_family from name variable in os-release for clearlinux system Signed-off-by: Josue David Hernandez Gutierrez * Add os_family for clear linux and clear linux mixes Signed-off-by: Josue David Hernandez Gutierrez --- lib/ansible/module_utils/facts/system/distribution.py | 6 +++++- test/units/module_utils/test_distribution_version.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py index 4e298b0b34..211d907556 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -390,6 +390,9 @@ class DistributionFiles: release = re.search('ID=(.*)', data) if release: clear_facts['distribution_release'] = release.groups()[0] + pname = re.search('NAME="(.*)"', data) + if pname: + clear_facts['distribution'] = pname.groups()[0] return True, clear_facts @@ -454,7 +457,8 @@ class Distribution(object): 'AIX': ['AIX'], 'HP-UX': ['HPUX'], 'Darwin': ['MacOSX'], - 'FreeBSD': ['FreeBSD', 'TrueOS']} + 'FreeBSD': ['FreeBSD', 'TrueOS'], + 'ClearLinux': ['Clear Linux OS', 'Clear Linux Mix']} OS_FAMILY = {} for family, names in OS_FAMILY_MAP.items(): diff --git a/test/units/module_utils/test_distribution_version.py b/test/units/module_utils/test_distribution_version.py index 33faf98d22..ee70c2ffd3 100644 --- a/test/units/module_utils/test_distribution_version.py +++ b/test/units/module_utils/test_distribution_version.py @@ -1006,7 +1006,7 @@ PRIVACY_POLICY_URL="http://www.intel.com/privacy" "name": "ClearLinux 26580", "result": { "distribution_release": "clear-linux-os", - "distribution": "ClearLinux", + "distribution": "Clear Linux OS", "distribution_major_version": "26580", "os_family": "ClearLinux", "distribution_version": "26580"