From 623e0eee4291c3783772ccc1e3408dbcc19eae46 Mon Sep 17 00:00:00 2001 From: Harshvardhan Sharma Date: Tue, 9 Jan 2024 21:19:49 +0530 Subject: [PATCH] Add Alp-Dolomite to Suse family list (#82496) --- .../82496-add-alp-dolomite-suse-family.yaml | 2 ++ .../module_utils/facts/system/distribution.py | 2 +- .../distribution/fixtures/alp-dolomite.json | 23 +++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/82496-add-alp-dolomite-suse-family.yaml create mode 100644 test/units/module_utils/facts/system/distribution/fixtures/alp-dolomite.json diff --git a/changelogs/fragments/82496-add-alp-dolomite-suse-family.yaml b/changelogs/fragments/82496-add-alp-dolomite-suse-family.yaml new file mode 100644 index 00000000000..3d3590a3410 --- /dev/null +++ b/changelogs/fragments/82496-add-alp-dolomite-suse-family.yaml @@ -0,0 +1,2 @@ +bugfixes: + - distribution.py - Recognize ALP-Dolomite as part of the SUSE OS family in Ansible, fixing its previous misidentification (https://github.com/ansible/ansible/pull/82496). diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py index 61cc8f6c971..b274a85a800 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -517,7 +517,7 @@ class Distribution(object): 'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux', 'Pop!_OS', 'Parrot', 'Pardus GNU/Linux', 'Uos', 'Deepin', 'OSMC'], 'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed', - 'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap'], + 'SLES_SAP', 'SUSE_LINUX', 'openSUSE Leap', 'ALP-Dolomite'], 'Archlinux': ['Archlinux', 'Antergos', 'Manjaro'], 'Mandrake': ['Mandrake', 'Mandriva'], 'Solaris': ['Solaris', 'Nexenta', 'OmniOS', 'OpenIndiana', 'SmartOS'], diff --git a/test/units/module_utils/facts/system/distribution/fixtures/alp-dolomite.json b/test/units/module_utils/facts/system/distribution/fixtures/alp-dolomite.json new file mode 100644 index 00000000000..04855dd52ce --- /dev/null +++ b/test/units/module_utils/facts/system/distribution/fixtures/alp-dolomite.json @@ -0,0 +1,23 @@ +{ + "platform.dist": ["", "", ""], + "distro": { + "codename": "", + "id": "alp-dolomite", + "name": "SUSE ALP Dolomite", + "version": "1.0", + "version_best": "1.0", + "os_release_info": {}, + "lsb_release_info": {} + }, + "input": { + "/etc/os-release": "NAME=\"ALP-Dolomite\"\nVERSION=\"1.0\"\nID=alp-dolomite\nID_LIKE=\"suse\"\nVERSION_ID=\"1.0\"\nPRETTY_NAME=\"SUSE ALP Dolomite 1.0\"\nANSI_COLOR=\"0;32\"\nCPE_NAME=\"cpe:/o:suse:alp-dolomite:1.0\"\nHOME_URL=\"https://susealp.io/\"\nDOCUMENTATION_URL=\"https://documentation.suse.com/#alp\"\nLOGO=\"distributor-logo\"\n" + }, + "name": "SUSE ALP Dolomite 1.0", + "result": { + "distribution_release": "NA", + "distribution": "ALP-Dolomite", + "distribution_major_version": "1", + "os_family": "Suse", + "distribution_version": "1.0" + } +} \ No newline at end of file