From 4edd6ba04feaaa6933ada38a2aa5759f714e31bb Mon Sep 17 00:00:00 2001 From: tikfj <143784879+tikfj@users.noreply.github.com> Date: Wed, 28 Feb 2024 02:42:16 +0900 Subject: [PATCH] Add MIRACLE LINUX as RedHat OS Family (#82722) Co-authored-by: Taiki Fujiwara --- .../miracle_linux_distribution_support.yml | 2 + .../module_utils/facts/system/distribution.py | 2 +- .../fixtures/miracle_linux_9.json | 39 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/miracle_linux_distribution_support.yml create mode 100644 test/units/module_utils/facts/system/distribution/fixtures/miracle_linux_9.json diff --git a/changelogs/fragments/miracle_linux_distribution_support.yml b/changelogs/fragments/miracle_linux_distribution_support.yml new file mode 100644 index 00000000000..015c4bea213 --- /dev/null +++ b/changelogs/fragments/miracle_linux_distribution_support.yml @@ -0,0 +1,2 @@ +minor_changes: +- Added MIRACLE LINUX 9.2 in RedHat OS Family. diff --git a/lib/ansible/module_utils/facts/system/distribution.py b/lib/ansible/module_utils/facts/system/distribution.py index b274a85a800..ee20fcb94f0 100644 --- a/lib/ansible/module_utils/facts/system/distribution.py +++ b/lib/ansible/module_utils/facts/system/distribution.py @@ -512,7 +512,7 @@ class Distribution(object): 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', 'OEL', 'Amazon', 'Amzn', 'Virtuozzo', 'XenServer', 'Alibaba', 'EulerOS', 'openEuler', 'AlmaLinux', 'Rocky', 'TencentOS', - 'EuroLinux', 'Kylin Linux Advanced Server'], + 'EuroLinux', 'Kylin Linux Advanced Server', 'MIRACLE'], 'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon', 'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux', 'Pop!_OS', 'Parrot', 'Pardus GNU/Linux', 'Uos', 'Deepin', 'OSMC'], diff --git a/test/units/module_utils/facts/system/distribution/fixtures/miracle_linux_9.json b/test/units/module_utils/facts/system/distribution/fixtures/miracle_linux_9.json new file mode 100644 index 00000000000..e402dfe9778 --- /dev/null +++ b/test/units/module_utils/facts/system/distribution/fixtures/miracle_linux_9.json @@ -0,0 +1,39 @@ +{ + "name": "MIRACLE LINUX 9.2", + "distro": { + "codename": "Feige", + "id": "miraclelinux", + "name": "MIRACLE LINUX", + "version": "9.2", + "version_best": "9.2", + "lsb_release_info": {}, + "os_release_info": { + "name": "MIRACLE LINUX", + "version": "9.2 (Feige)", + "id": "miraclelinux", + "version_id": "9.2", + "pretty_name": "MIRACLE LINUX 9.2 (Feige)", + "ansi_color": "0;32", + "codename": "Feige" + } + }, + "input": { + "/etc/miraclelinux-release": "MIRACLE LINUX release 9.2 (Feige)\n", + "/etc/redhat-release": "MIRACLE LINUX release 9.2 (Feige)\n", + "/etc/system-release": "MIRACLE LINUX release 9.2 (Feige)\n", + "/etc/os-release": "NAME=\"MIRACLE LINUX\"\nVERSION=\"9.2 (Feige)\"\nID=\"miraclelinux\"\nID_LIKE=\"rhel fedora\"\nVERSION_ID=\"9.2\"\nPLATFORM_ID=\"platform:el9\"\nPRETTY_NAME=\"MIRACLE LINUX 9.2 (Feige)\"\nANSI_COLOR=\"0;32\"\nLOGO=\"fedora-logo-icon\"\nCPE_NAME=\"cpe:/o:cybertrust_japan:miracle_linux:9\"\nHOME_URL=\"https://www.cybertrust.co.jp/miracle-linux/\"\nDOCUMENTATION_URL=\"https://www.miraclelinux.com/support/miraclelinux9\"\nBUG_REPORT_URL=\"https://bugzilla.asianux.com/\"\n\nMIRACLELINUX_SUPPORT_PRODUCT=\"MIRACLE LINUX\"\nMIRACLELINUX_SUPPORT_PRODUCT_VERSION=\"9\"" + }, + "platform.dist": [ + "miraclelinux", + "9.2", + "Feige" + ], + "result": { + "distribution": "MIRACLE", + "distribution_version": "9.2", + "distribution_release": "Feige", + "distribution_major_version": "9", + "os_family": "RedHat" + }, + "platform.release": "5.14.0-284.25.1.el9_2.x86_64" +}