From 6124dc0cf1a7653f11e88d80290aeb231e486cab Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 26 Apr 2022 11:11:12 -0300 Subject: [PATCH] ipatrust: Updated ipatrust documentation. This patch updates the ipatrust documentation about the 'trust_type' parameter, and changes one password to be similar to the standard passwords used in other modules. --- README-trust.md | 1 + plugins/modules/ipatrust.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README-trust.md b/README-trust.md index ef04f6c..efa69c7 100644 --- a/README-trust.md +++ b/README-trust.md @@ -105,6 +105,7 @@ Variable | Description | Required `password` | Active Directory domain administrator's password string. | no `server` | Domain controller for the Active Directory domain string. | no `trust_secret` | Shared secret for the trust string. | no +`trust_type` | Trust type. Currently, only 'ad' for Active Directory is supported. | no `base_id` | First posix id for the trusted domain integer. | no `range_size` | Size of the ID range reserved for the trusted domain integer. | no `range_type` | Type of trusted domain ID range, It can be one of `ipa-ad-trust` or `ipa-ad-trust-posix`and defaults to `ipa-ad-trust`. | no diff --git a/plugins/modules/ipatrust.py b/plugins/modules/ipatrust.py index 0c7aac5..d94ec94 100644 --- a/plugins/modules/ipatrust.py +++ b/plugins/modules/ipatrust.py @@ -44,7 +44,8 @@ options: description: - Trust type (ad for Active Directory, default) default: ad - required: true + required: false + choices: ["ad"] admin: description: - Active Directory domain administrator @@ -103,7 +104,7 @@ EXAMPLES = """ realm: ad.example.test trust_type: ad admin: Administrator - password: Welcome2020! + password: SomeW1Npassword state: present # delete ad-trust -- 2.37.3 From 423a6b0e12e87adb86cd76095a7b260d19ab4959 Mon Sep 17 00:00:00 2001 From: Rafael Guterres Jeffman Date: Tue, 12 Apr 2022 18:47:20 -0300 Subject: [PATCH] ipatrust: Set valid choices for trust_type. Ensure only valid choices for trust_type ('ad') are available for the module parameter. --- plugins/modules/ipatrust.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/modules/ipatrust.py b/plugins/modules/ipatrust.py index 6251ecc..0c7aac5 100644 --- a/plugins/modules/ipatrust.py +++ b/plugins/modules/ipatrust.py @@ -190,7 +190,8 @@ def main(): state=dict(type="str", default="present", choices=["present", "absent"]), # present - trust_type=dict(type="str", default="ad", required=False), + trust_type=dict(type="str", default="ad", required=False, + choices=["ad"]), admin=dict(type="str", default=None, required=False), password=dict(type="str", default=None, required=False, no_log=True), -- 2.37.3