From 16a9c9ae2504ccb65db875645846205422087504 Mon Sep 17 00:00:00 2001 From: gongnan Date: Thu, 16 Dec 2021 17:09:18 +0800 Subject: [PATCH] ansible-2.5.5 hostname module support openEuler (cherry picked from commit 564ef3e9885b20548deb02f384f679e9b9b25229) --- ansible-2.5.5-openEuler-hostname.patch | 38 ++++++++++++++++++++++++++ ansible.spec | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 ansible-2.5.5-openEuler-hostname.patch diff --git a/ansible-2.5.5-openEuler-hostname.patch b/ansible-2.5.5-openEuler-hostname.patch new file mode 100644 index 0000000..35541f5 --- /dev/null +++ b/ansible-2.5.5-openEuler-hostname.patch @@ -0,0 +1,38 @@ +diff --color -Nur ansible-2.5.5.orig/lib/ansible/modules/system/hostname.py ansible-2.5.5/lib/ansible/modules/system/hostname.py +--- ansible-2.5.5.orig/lib/ansible/modules/system/hostname.py 2018-06-15 05:20:41.000000000 +0800 ++++ ansible-2.5.5/lib/ansible/modules/system/hostname.py 2021-12-16 16:28:49.652405482 +0800 +@@ -762,6 +762,10 @@ + distribution = 'Neon' + strategy_class = DebianStrategy + ++class OpenEulerHostname(Hostname): ++ platform = 'Linux' ++ distribution = 'Openeuler' ++ strategy_class = SystemdStrategy + + def main(): + module = AnsibleModule( +diff --color -Nur ansible-2.5.5.orig/lib/ansible/module_utils/facts/system/distribution.py ansible-2.5.5/lib/ansible/module_utils/facts/system/distribution.py +--- ansible-2.5.5.orig/lib/ansible/module_utils/facts/system/distribution.py 2018-06-15 05:20:41.000000000 +0800 ++++ ansible-2.5.5/lib/ansible/module_utils/facts/system/distribution.py 2021-12-16 14:16:19.859943412 +0800 +@@ -408,7 +408,7 @@ + # keep keys in sync with Conditionals page of docs + OS_FAMILY_MAP = {'RedHat': ['RedHat', 'Fedora', 'CentOS', 'Scientific', 'SLC', + 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', +- 'OEL', 'Amazon', 'Virtuozzo', 'XenServer'], ++ 'OEL', 'Amazon', 'Virtuozzo', 'XenServer', 'openEuler'], + 'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon', + 'Linux Mint'], + 'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed', +diff --color -Nur ansible-2.5.5.orig/test/sanity/import/lib/ansible/module_utils/facts/system/distribution.py ansible-2.5.5/test/sanity/import/lib/ansible/module_utils/facts/system/distribution.py +--- ansible-2.5.5.orig/test/sanity/import/lib/ansible/module_utils/facts/system/distribution.py 2018-06-15 05:20:41.000000000 +0800 ++++ ansible-2.5.5/test/sanity/import/lib/ansible/module_utils/facts/system/distribution.py 2021-12-16 14:16:19.859943412 +0800 +@@ -408,7 +408,7 @@ + # keep keys in sync with Conditionals page of docs + OS_FAMILY_MAP = {'RedHat': ['RedHat', 'Fedora', 'CentOS', 'Scientific', 'SLC', + 'Ascendos', 'CloudLinux', 'PSBM', 'OracleLinux', 'OVS', +- 'OEL', 'Amazon', 'Virtuozzo', 'XenServer'], ++ 'OEL', 'Amazon', 'Virtuozzo', 'XenServer', 'openEuler'], + 'Debian': ['Debian', 'Ubuntu', 'Raspbian', 'Neon', 'KDE neon', + 'Linux Mint'], + 'Suse': ['SuSE', 'SLES', 'SLED', 'openSUSE', 'openSUSE Tumbleweed', diff --git a/ansible.spec b/ansible.spec index aed6248..c982ec0 100644 --- a/ansible.spec +++ b/ansible.spec @@ -8,6 +8,7 @@ License: Python-2.0 and MIT and GPL+ Url: http://ansible.com Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz Patch0: 0001-Changes-to-support-building-docs-with-old-jinja2.patch +Patch1: ansible-2.5.5-openEuler-hostname.patch Patch100: ansible-newer-jinja.patch Patch101: CVE-2019-14904.patch Patch102: CVE-2020-10684.patch @@ -73,6 +74,7 @@ This package installs extensive documentation for ansible %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p1 -- Gitee