From e84ed3b6ba35e18ab2144639d710123d46c8281e Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 13 Sep 2023 13:09:24 +0200 Subject: [PATCH 1/2] utils/templates/test_module_client_context.yml.in: Fix FQDN issue Fixes left over FQDN issue for include_tasks. --- utils/templates/test_module_client_context.yml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/templates/test_module_client_context.yml.in b/utils/templates/test_module_client_context.yml.in index 193cd6f3..ac92c081 100644 --- a/utils/templates/test_module_client_context.yml.in +++ b/utils/templates/test_module_client_context.yml.in @@ -9,7 +9,7 @@ tasks: - name: Include FreeIPA facts. - include_tasks: ../env_freeipa_facts.yml + ansible.builtin.include_tasks: ../env_freeipa_facts.yml # Test will only be executed if host is not a server. - name: Execute with server context in the client. From 60593b7dd3abd56045beb9b8c900f70634b40e92 Mon Sep 17 00:00:00 2001 From: Thomas Woerner Date: Wed, 13 Sep 2023 13:20:47 +0200 Subject: [PATCH 2/2] utils/templates/ipamodule*.py.in: Fix superfluous type in argument spec The type was given twice for state and action argument specs. This has been fixed. --- utils/templates/ipamodule+member.py.in | 4 ++-- utils/templates/ipamodule.py.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/templates/ipamodule+member.py.in b/utils/templates/ipamodule+member.py.in index 5ce5cf1b..3d34d77b 100644 --- a/utils/templates/ipamodule+member.py.in +++ b/utils/templates/ipamodule+member.py.in @@ -157,10 +157,10 @@ def main(): PARAMETER2=dict(required=False, type='list', elements='str', default=None, aliases=["API_PARAMETER_NAME"]), # action - action=dict(type="str", default="$name", type="str", + action=dict(type="str", default="$name", choices=["member", "$name"]), # state - state=dict(type="str", default="present", type="str", + state=dict(type="str", default="present", choices=["present", "absent"]), ), supports_check_mode=True, diff --git a/utils/templates/ipamodule.py.in b/utils/templates/ipamodule.py.in index aa52257b..3b1bf1e8 100644 --- a/utils/templates/ipamodule.py.in +++ b/utils/templates/ipamodule.py.in @@ -128,7 +128,7 @@ def main(): PARAMETER2=dict(required=False, type='list', elements='str', aliases=["API_PARAMETER_NAME"], default=None), # state - state=dict(type="str", default="present", type="str", + state=dict(type="str", default="present", choices=["present", "absent"]), ), supports_check_mode=True,