From 3daa1dec0c2112446b733abf7b62121c63d32340 Mon Sep 17 00:00:00 2001 From: umiruka <211638667+umiruka@users.noreply.github.com> Date: Sun, 18 May 2025 22:39:50 +0200 Subject: [PATCH] Fix TypeError caused by giving more than 2 positional arguments to CobblerXMLRPCInterface.get_system_handle() (#10145) * Update cobbler system module to also use new get_system_handle method definition * Add changelog for bug fix for cobbler system module --- .../fragments/10145-fix-typeerror-cobbler-xmlrpc.yml | 2 ++ plugins/modules/cobbler_system.py | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/10145-fix-typeerror-cobbler-xmlrpc.yml diff --git a/changelogs/fragments/10145-fix-typeerror-cobbler-xmlrpc.yml b/changelogs/fragments/10145-fix-typeerror-cobbler-xmlrpc.yml new file mode 100644 index 0000000000..e2a9954ea1 --- /dev/null +++ b/changelogs/fragments/10145-fix-typeerror-cobbler-xmlrpc.yml @@ -0,0 +1,2 @@ +bugfixes: + - cobbler_system - fix bug with Cobbler >= 3.4.0 caused by giving more than 2 positional arguments to ``CobblerXMLRPCInterface.get_system_handle()`` (https://github.com/ansible-collections/community.general/issues/8506, https://github.com/ansible-collections/community.general/pull/10145). \ No newline at end of file diff --git a/plugins/modules/cobbler_system.py b/plugins/modules/cobbler_system.py index fd1db6bf3e..207d4c6d40 100644 --- a/plugins/modules/cobbler_system.py +++ b/plugins/modules/cobbler_system.py @@ -161,6 +161,8 @@ from ansible.module_utils.common.text.converters import to_text from ansible_collections.community.general.plugins.module_utils.datetime import ( now, ) +from ansible_collections.community.general.plugins.module_utils.version import LooseVersion + IFPROPS_MAPPING = dict( bondingopts='bonding_opts', @@ -278,7 +280,11 @@ def main(): if system: # Update existing entry - system_id = conn.get_system_handle(name, token) + system_id = None + if LooseVersion(str(conn.version())) >= LooseVersion('3.4.0'): + system_id = conn.get_system_handle(name) + else: + system_id = conn.get_system_handle(name, token) for key, value in iteritems(module.params['properties']): if key not in system: