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