Skip to content

Commit

Permalink
Merge pull request #1264 from t-woerner/module_documentation_fixes
Browse files Browse the repository at this point in the history
Documentation fixes for issues found by ansible-test part of ansible-core 2.17.1
  • Loading branch information
rjeffman authored Jul 1, 2024
2 parents 719d1cd + cd16490 commit 16a4eb8
Show file tree
Hide file tree
Showing 26 changed files with 83 additions and 18 deletions.
2 changes: 1 addition & 1 deletion plugins/doc_fragments/ipamodule_base_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,5 @@ class ModuleDocFragment(object): # pylint: disable=R0205,R0903
Continuous mode. Don't stop on errors. Valid only if `state` is `absent`.
aliases: ["continue"]
type: bool
default: True
default: true
"""
3 changes: 1 addition & 2 deletions plugins/inventory/freeipa.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
DOCUMENTATION = """
---
name: freeipa
plugin_type: inventory
version_added: "1.13"
version_added: "1.13.0"
short_description: Compiles a dynamic inventory from IPA domain
description: |
Compiles a dynamic inventory from IPA domain, filters servers by role(s).
Expand Down
7 changes: 5 additions & 2 deletions plugins/modules/ipacert.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
DOCUMENTATION = """
---
module: ipacert
short description: Manage FreeIPA certificates
short_description: Manage FreeIPA certificates
description: Manage FreeIPA certificates
extends_documentation_fragment:
- ipamodule_base_docs
Expand Down Expand Up @@ -67,6 +67,10 @@
description: Name of the issuing certificate authority.
type: str
required: false
chain:
description: Include certificate chain in output.
type: bool
required: false
serial_number:
description: |
Certificate serial number. Cannot be used with `state: requested`.
Expand Down Expand Up @@ -102,7 +106,6 @@
required: true
type: str
author:
authors:
- Sam Morris (@yrro)
- Rafael Guterres Jeffman (@rjeffman)
"""
Expand Down
4 changes: 2 additions & 2 deletions plugins/modules/ipaidoverrideuser.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
sshpubkey:
description: List of SSH public keys
type: list
element: str
elements: str
required: False
aliases: ["ipasshpubkey"]
certificate:
Expand All @@ -113,7 +113,7 @@
description: |
Suppress processing of membership attributes.
Valid only if `state` is `absent`.
type: str
type: bool
required: False
aliases: ["no_members"]
action:
Expand Down
5 changes: 2 additions & 3 deletions plugins/modules/ipaidp.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
description: OAuth 2.0 client secret
required: false
type: str
no_log: true
aliases: ["ipaidpclientsecret"]
scope:
description: OAuth 2.0 scope. Multiple scopes separated by space
Expand Down Expand Up @@ -362,11 +361,11 @@ def main():
dev_auth_uri=dict(required=False, type="str", default=None,
aliases=["ipaidpdevauthendpoint"]),
token_uri=dict(required=False, type="str", default=None,
aliases=["ipaidptokenendpoint"]),
aliases=["ipaidptokenendpoint"], no_log=False),
userinfo_uri=dict(required=False, type="str", default=None,
aliases=["ipaidpuserinfoendpoint"]),
keys_uri=dict(required=False, type="str", default=None,
aliases=["ipaidpkeysendpoint"]),
aliases=["ipaidpkeysendpoint"], no_log=False),
issuer_url=dict(required=False, type="str", default=None,
aliases=["ipaidpissuerurl"]),
client_id=dict(required=False, type="str", default=None,
Expand Down
9 changes: 8 additions & 1 deletion plugins/modules/ipaservice.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
description: The service to manage
type: list
elements: str
required: true
required: false
aliases: ["service"]
services:
description: The list of service dicts.
Expand Down Expand Up @@ -167,6 +167,13 @@
type: list
elements: str
aliases: ["ipaallowedtoperform_read_keys_hostgroup"]
delete_continue:
description:
Continuous mode. Don't stop on errors.
Valid only if `state` is `absent`.
required: false
type: bool
aliases: ["continue"]
certificate:
description: Base-64 encoded service certificate.
required: false
Expand Down
1 change: 1 addition & 0 deletions roles/ipaclient/library/ipaclient_setup_nss.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
description: True if selinux status check passed
required: false
type: bool
default: false
krb_name:
description: The krb5 config file name
type: str
Expand Down
3 changes: 3 additions & 0 deletions roles/ipareplica/library/ipareplica_create_ipa_conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -70,6 +71,7 @@
type: list
elements: str
required: no
default: []
no_host_dns:
description: Do not use DNS for hostname lookup during installation
type: bool
Expand Down Expand Up @@ -97,6 +99,7 @@
type: list
elements: str
required: no
default: []
force_join:
description: Force client enrollment even if already enrolled
type: bool
Expand Down
4 changes: 4 additions & 0 deletions roles/ipareplica/library/ipareplica_install_ca_certs.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -70,6 +71,7 @@
type: list
elements: str
required: no
default: []
no_host_dns:
description: Do not use DNS for hostname lookup during installation
type: bool
Expand Down Expand Up @@ -97,6 +99,7 @@
type: list
elements: str
required: no
default: []
force_join:
description: Force client enrollment even if already enrolled
type: bool
Expand Down Expand Up @@ -156,6 +159,7 @@
type: list
elements: str
required: no
default: []
author:
- Thomas Woerner (@t-woerner)
'''
Expand Down
9 changes: 8 additions & 1 deletion roles/ipareplica/library/ipareplica_prepare.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -77,6 +78,7 @@
type: list
elements: str
required: no
default: []
no_host_dns:
description: Do not use DNS for hostname lookup during installation
type: bool
Expand Down Expand Up @@ -104,6 +106,7 @@
type: list
elements: str
required: no
default: []
dirsrv_cert_name:
description: Name of the Directory Server SSL certificate to install
type: str
Expand All @@ -118,6 +121,7 @@
type: list
elements: str
required: no
default: []
http_cert_name:
description: Name of the Apache Server SSL certificate to install
type: str
Expand All @@ -132,6 +136,7 @@
type: list
elements: str
required: no
default: []
pkinit_cert_name:
description: Name of the Kerberos KDC SSL certificate to install
type: str
Expand Down Expand Up @@ -182,6 +187,7 @@
type: list
elements: str
required: no
default: []
no_reverse:
description: Do not create new reverse DNS zone
type: bool
Expand All @@ -197,6 +203,7 @@
type: list
elements: str
required: no
default: []
no_forwarders:
description: Do not add any DNS forwarders, use root servers instead
type: bool
Expand Down Expand Up @@ -250,7 +257,7 @@
type: bool
default: no
required: no
client_configured:
ipa_client_installed:
description: Was client configured already
type: bool
required: yes
Expand Down
1 change: 1 addition & 0 deletions roles/ipareplica/library/ipareplica_setup_ca.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
type: list
elements: str
required: no
default: []
author:
- Thomas Woerner (@t-woerner)
'''
Expand Down
1 change: 1 addition & 0 deletions roles/ipareplica/library/ipareplica_setup_dns.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
type: list
elements: str
required: no
default: []
forward_policy:
description: DNS forwarding policy for global forwarders
type: str
Expand Down
4 changes: 4 additions & 0 deletions roles/ipareplica/library/ipareplica_setup_ds.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -70,6 +71,7 @@
type: list
elements: str
required: no
default: []
no_host_dns:
description: Do not use DNS for hostname lookup during installation
type: bool
Expand Down Expand Up @@ -108,6 +110,7 @@
type: list
elements: str
required: no
default: []
force_join:
description: Force client enrollment even if already enrolled
type: bool
Expand Down Expand Up @@ -176,6 +179,7 @@
type: list
elements: str
required: no
default: []
author:
- Thomas Woerner (@t-woerner)
'''
Expand Down
3 changes: 3 additions & 0 deletions roles/ipareplica/library/ipareplica_setup_kra.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -70,6 +71,7 @@
type: list
elements: str
required: no
default: []
no_host_dns:
description: Do not use DNS for hostname lookup during installation
type: bool
Expand Down Expand Up @@ -101,6 +103,7 @@
type: list
elements: str
required: no
default: []
force_join:
description: Force client enrollment even if already enrolled
type: bool
Expand Down
8 changes: 8 additions & 0 deletions roles/ipareplica/library/ipareplica_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
type: list
elements: str
required: no
default: []
domain:
description: Primary DNS domain of the IPA deployment
type: str
Expand All @@ -51,6 +52,7 @@
type: list
elements: str
required: no
default: []
realm:
description: Kerberos realm name of the IPA deployment
type: str
Expand All @@ -66,6 +68,7 @@
type: list
elements: str
required: no
default: []
hidden_replica:
description: Install a hidden replica
type: bool
Expand Down Expand Up @@ -112,18 +115,21 @@
type: list
elements: str
required: no
default: []
http_cert_files:
description:
File containing the Apache Server SSL certificate and private key
type: list
elements: str
required: no
default: []
pkinit_cert_files:
description:
File containing the Kerberos KDC SSL certificate and private key
type: list
elements: str
required: no
default: []
no_ntp:
description: Do not configure ntp
type: bool
Expand All @@ -134,6 +140,7 @@
type: list
elements: str
required: no
default: []
ntp_pool:
description: ntp server pool to use
type: str
Expand All @@ -153,6 +160,7 @@
type: list
elements: str
required: no
default: []
no_forwarders:
description: Do not add any DNS forwarders, use root servers instead
type: bool
Expand Down
Loading

0 comments on commit 16a4eb8

Please sign in to comment.