77 lines
4.2 KiB
Diff
77 lines
4.2 KiB
Diff
|
|
diff --color -Nur ansible.2.9.22.orig/lib/ansible/modules/system/hostname.py ansible-2.9.22/lib/ansible/modules/system/hostname.py
|
||
|
|
--- ansible.2.9.22.orig/lib/ansible/modules/system/hostname.py 2021-05-24 14:18:02.000000000 -0700
|
||
|
|
+++ ansible-2.9.22/lib/ansible/modules/system/hostname.py 2021-06-19 10:09:53.078883364 -0700
|
||
|
|
@@ -782,6 +782,10 @@
|
||
|
|
distribution = 'Neon'
|
||
|
|
strategy_class = DebianStrategy
|
||
|
|
|
||
|
|
+class RockyLinuxHostname(Hostname):
|
||
|
|
+ platform = 'Linux'
|
||
|
|
+ distribution = 'Rocky'
|
||
|
|
+ strategy_class = SystemdStrategy
|
||
|
|
|
||
|
|
def main():
|
||
|
|
module = AnsibleModule(
|
||
|
|
diff --color -Nur ansible.2.9.22.orig/lib/ansible/module_utils/facts/system/distribution.py ansible-2.9.22/lib/ansible/module_utils/facts/system/distribution.py
|
||
|
|
--- ansible.2.9.22.orig/lib/ansible/module_utils/facts/system/distribution.py 2021-05-24 14:18:01.000000000 -0700
|
||
|
|
+++ ansible-2.9.22/lib/ansible/module_utils/facts/system/distribution.py 2021-06-19 10:09:38.680877684 -0700
|
||
|
|
@@ -467,7 +467,7 @@
|
||
|
|
OS_FAMILY_MAP = {'RedHat': ['RedHat', 'Fedora', 'CentOS', 'Scientific', 'SLC',
|
||
|
|
'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS',
|
||
|
|
'OEL', 'Amazon', 'Virtuozzo', 'XenServer', 'Alibaba',
|
||
|
|
- 'AlmaLinux'],
|
||
|
|
+ 'AlmaLinux', 'Rocky'],
|
||
|
|
'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon',
|
||
|
|
'Linux Mint', 'SteamOS', 'Devuan', 'Kali', 'Cumulus Linux'],
|
||
|
|
'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed',
|
||
|
|
diff --color -Nur ansible.2.9.22.orig/test/units/module_utils/facts/system/distribution/fixtures/rockylinux_8_3.json ansible-2.9.22/test/units/module_utils/facts/system/distribution/fixtures/rockylinux_8_3.json
|
||
|
|
--- ansible.2.9.22.orig/test/units/module_utils/facts/system/distribution/fixtures/rockylinux_8_3.json 1969-12-31 16:00:00.000000000 -0800
|
||
|
|
+++ ansible-2.9.22/test/units/module_utils/facts/system/distribution/fixtures/rockylinux_8_3.json 2021-06-19 10:12:39.019948830 -0700
|
||
|
|
@@ -0,0 +1,46 @@
|
||
|
|
+{
|
||
|
|
+ "name": "Rocky 8.3",
|
||
|
|
+ "distro": {
|
||
|
|
+ "codename": "",
|
||
|
|
+ "id": "rocky",
|
||
|
|
+ "name": "Rocky Linux",
|
||
|
|
+ "version": "8.3",
|
||
|
|
+ "version_best": "8.3",
|
||
|
|
+ "lsb_release_info": {},
|
||
|
|
+ "os_release_info": {
|
||
|
|
+ "name": "Rocky Linux",
|
||
|
|
+ "version": "8.3",
|
||
|
|
+ "id": "rocky",
|
||
|
|
+ "id_like": "rhel fedora",
|
||
|
|
+ "version_id": "8.3",
|
||
|
|
+ "platform_id": "platform:el8",
|
||
|
|
+ "pretty_name": "Rocky Linux 8.3",
|
||
|
|
+ "ansi_color": "0;31",
|
||
|
|
+ "cpe_name": "cpe:/o:rocky:rocky:8",
|
||
|
|
+ "home_url": "https://rockylinux.org/",
|
||
|
|
+ "bug_report_url": "https://bugs.rockylinux.org/",
|
||
|
|
+ "rocky_support_product": "Rocky Linux",
|
||
|
|
+ "rocky_support_product_version": "8"
|
||
|
|
+ }
|
||
|
|
+ },
|
||
|
|
+ "input": {
|
||
|
|
+ "/etc/redhat-release": "Rocky Linux release 8.3\n",
|
||
|
|
+ "/etc/system-release": "Rocky Linux release 8.3\n",
|
||
|
|
+ "/etc/rocky-release": "Rocky Linux release 8.3\n",
|
||
|
|
+ "/etc/os-release": "NAME=\"Rocky Linux\"\nVERSION=\"8.3\"\nID=\"rocky\"\nID_LIKE=\"rhel fedora\"\nVERSION_ID=\"8.3\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"Rocky Linux 8.3\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:rocky:rocky:8\"\nHOME_URL=\"https://rockylinux.org/\"\nBUG_REPORT_URL=\"https://bugs.rockylinux.org/\"\nROCKY_SUPPORT_PRODUCT=\"Rocky Linux\"\nROCKY_SUPPORT_PRODUCT_VERSION=\"8\"\n",
|
||
|
|
+ "/usr/lib/os-release": "NAME=\"Rocky Linux\"\nVERSION=\"8.3\"\nID=\"rocky\"\nID_LIKE=\"rhel fedora\"\nVERSION_ID=\"8.3\"\nPLATFORM_ID=\"platform:el8\"\nPRETTY_NAME=\"Rocky Linux 8.3\"\nANSI_COLOR=\"0;31\"\nCPE_NAME=\"cpe:/o:rocky:rocky:8\"\nHOME_URL=\"https://rockylinux.org/\"\nBUG_REPORT_URL=\"https://bugs.rockylinux.org/\"\nROCKY_SUPPORT_PRODUCT=\"Rocky Linux\"\nROCKY_SUPPORT_PRODUCT_VERSION=\"8\"\n"
|
||
|
|
+ },
|
||
|
|
+ "platform.dist": [
|
||
|
|
+ "rocky",
|
||
|
|
+ "8.3",
|
||
|
|
+ ""
|
||
|
|
+ ],
|
||
|
|
+ "result": {
|
||
|
|
+ "distribution": "Rocky",
|
||
|
|
+ "distribution_version": "8.3",
|
||
|
|
+ "distribution_release": "NA",
|
||
|
|
+ "distribution_major_version": "8",
|
||
|
|
+ "os_family": "RedHat"
|
||
|
|
+ },
|
||
|
|
+ "platform.release": "4.18.0-240.22.1.el8.x86_64"
|
||
|
|
+}
|