Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add tencentos fact distro #76459

Merged
merged 3 commits into from Dec 7, 2021
Merged

add tencentos fact distro #76459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4cbbb73
add tencentos fact distro
jameslivulpi Dec 3, 2021
372edec
Update changelogs/fragments/76343-tencentos-dnf.yml
jameslivulpi Dec 6, 2021
9ab6fb0
add mock test and add tencentos to RedHat OS_FAMILY_MAP
jameslivulpi Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/76343-tencentos-dnf.yml
View file
Open in desktop
@@ -0,0 +1,2 @@
bugfixes:
- distribution - detect tencentos and gather correct facts on the distro.
6 changes: 5 additions & 1 deletion lib/ansible/module_utils/facts/system/distribution.py
View file
Open in desktop
Expand Up @@ -464,6 +464,10 @@ def parse_distribution_file_CentOS(self, name, data, path, collected_facts):
centos_facts['distribution_release'] = 'Stream'
return True, centos_facts

if "TencentOS Server" in data:
jameslivulpi marked this conversation as resolved.
Show resolved Hide resolved
centos_facts['distribution'] = 'TencentOS'
return True, centos_facts

return False, centos_facts


Expand All @@ -480,7 +484,7 @@ class Distribution(object):
OS_FAMILY_MAP = {'RedHat': ['RedHat', 'Fedora', 'CentOS', 'Scientific', 'SLC',
'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS',
'OEL', 'Amazon', 'Virtuozzo', 'XenServer', 'Alibaba',
'EulerOS', 'openEuler', 'AlmaLinux', 'Rocky'],
'EulerOS', 'openEuler', 'AlmaLinux', 'Rocky', 'TencentOS'],
'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon',
'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux',
'Pop!_OS', 'Parrot', 'Pardus GNU/Linux'],
Expand Down
50 changes: 50 additions & 0 deletions test/units/module_utils/facts/system/distribution/fixtures/tencentos_3_1.json
View file
Open in desktop
@@ -0,0 +1,50 @@
{
"name": "TencentOS 3.1",
"distro": {
"codename": "Final",
"id": "tencentos",
"name": "TencentOS Server",
"version": "3.1",
"version_best": "3.1",
"lsb_release_info": {},
"os_release_info": {
"name": "TencentOS Server",
"version": "3.1 (Final)",
"id": "tencentos",
"id_like": "rhel fedora centos",
"version_id": "3.1",
"platform_id": "platform:el8",
"pretty_name": "TencentOS Server 3.1 (Final)",
"ansi_color": "0;31",
"cpe_name": "cpe:/o:tencentos:tencentos:3",
"home_url": "https://tlinux.qq.com/",
"bug_report_url": "https://tlinux.qq.com/",
"centos_mantisbt_project": "CentOS-8",
"centos_mantisbt_project_version": "8",
"redhat_support_product": "centos",
"redhat_support_product_version": "8",
"name_orig": "CentOS Linux",
"codename": "Final"
}
},
"input": {
"/etc/centos-release": "NAME=\"TencentOS Server\"\nVERSION=\"3.1 (Final)\"\nID=\"tencentos\"\nID_LIKE=\"rhel fedora centos\"\nVERSION_ID=\"3.1\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"TencentOS Server 3.1 (Final)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:tencentos:tencentos:3\"\nHOME_URL=\"https://tlinux.qq.com/\"\nBUG_REPORT_URL=\"https://tlinux.qq.com/\"\n\nCENTOS_MANTISBT_PROJECT=\"CentOS-8\"\nCENTOS_MANTISBT_PROJECT_VERSION=\"8\"\nREDHAT_SUPPORT_PRODUCT=\"centos\"\nREDHAT_SUPPORT_PRODUCT_VERSION=\"8\"\nNAME_ORIG=\"CentOS Linux\"\n",
"/etc/redhat-release": "CentOS Linux release 8.4.2105 (Core)\n",
"/etc/system-release": "NAME=\"TencentOS Server\"\nVERSION=\"3.1 (Final)\"\nID=\"tencentos\"\nID_LIKE=\"rhel fedora centos\"\nVERSION_ID=\"3.1\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"TencentOS Server 3.1 (Final)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:tencentos:tencentos:3\"\nHOME_URL=\"https://tlinux.qq.com/\"\nBUG_REPORT_URL=\"https://tlinux.qq.com/\"\n\nCENTOS_MANTISBT_PROJECT=\"CentOS-8\"\nCENTOS_MANTISBT_PROJECT_VERSION=\"8\"\nREDHAT_SUPPORT_PRODUCT=\"centos\"\nREDHAT_SUPPORT_PRODUCT_VERSION=\"8\"\nNAME_ORIG=\"CentOS Linux\"\n",
"/etc/os-release": "NAME=\"TencentOS Server\"\nVERSION=\"3.1 (Final)\"\nID=\"tencentos\"\nID_LIKE=\"rhel fedora centos\"\nVERSION_ID=\"3.1\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"TencentOS Server 3.1 (Final)\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:tencentos:tencentos:3\"\nHOME_URL=\"https://tlinux.qq.com/\"\nBUG_REPORT_URL=\"https://tlinux.qq.com/\"\n\nCENTOS_MANTISBT_PROJECT=\"CentOS-8\"\nCENTOS_MANTISBT_PROJECT_VERSION=\"8\"\nREDHAT_SUPPORT_PRODUCT=\"centos\"\nREDHAT_SUPPORT_PRODUCT_VERSION=\"8\"\nNAME_ORIG=\"CentOS Linux\"\n",
"/usr/lib/os-release": "NAME=\"CentOS Linux\"\nVERSION=\"8\"\nID=\"centos\"\nID_LIKE=\"rhel fedora\"\nVERSION_ID=\"8\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"CentOS Linux 8\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:centos:centos:8\"\nHOME_URL=\"https://centos.org/\"\nBUG_REPORT_URL=\"https://bugs.centos.org/\"\nCENTOS_MANTISBT_PROJECT=\"CentOS-8\"\nCENTOS_MANTISBT_PROJECT_VERSION=\"8\"\n"
},
"platform.dist": [
"tencentos",
"3.1",
"Final"
],
"result": {
"distribution": "TencentOS",
"distribution_version": "3.1",
"distribution_release": "Final",
"distribution_major_version": "3",
"os_family": "RedHat"
},
"platform.release": "5.4.32-19-0001"
}