postgresql_owner: fix doc (#55091)

* postgresql_owner: fix doc

* postgresql_owner: fix doc

* postgresql_owner: fix doc
This commit is contained in:
Andrey Klychkov 2019-04-10 16:54:27 +03:00 committed by John R Barker
parent c3e50db1d5
commit d3dae4a444
3 changed files with 9 additions and 26 deletions

View file

@ -108,18 +108,11 @@ options:
type: str type: str
default: prefer default: prefer
choices: [ allow, disable, prefer, require, verify-ca, verify-full ] choices: [ allow, disable, prefer, require, verify-ca, verify-full ]
ssl_rootcert:
description:
- Specifies the name of a file containing SSL certificate authority (CA)
certificate(s).
- If the file exists, the server's certificate will be
verified to be signed by one of these authorities.
type: str
ca_cert: ca_cert:
description: description:
- Specifies the name of a file containing SSL certificate authority (CA) - Specifies the name of a file containing SSL certificate authority (CA) certificate(s).
certificate(s). If the file exists, the server's certificate will be - If the file exists, the server's certificate will be verified to be signed by one of these authorities.
verified to be signed by one of these authorities. type: str
aliases: [ ssl_rootcert ] aliases: [ ssl_rootcert ]
notes: notes:
- The default authentication assumes that you are either logging in as or - The default authentication assumes that you are either logging in as or
@ -353,9 +346,6 @@ def main():
fail_on_role=dict(type='bool', default=True), fail_on_role=dict(type='bool', default=True),
state=dict(type='str', default='present', choices=['absent', 'present']), state=dict(type='str', default='present', choices=['absent', 'present']),
db=dict(type='str', aliases=['login_db']), db=dict(type='str', aliases=['login_db']),
port=dict(type='int', default=5432, aliases=['login_port']),
ssl_mode=dict(type='str', default='prefer', choices=['allow', 'disable', 'prefer', 'require', 'verify-ca', 'verify-full']),
ssl_rootcert=dict(type='str'),
session_role=dict(type='str'), session_role=dict(type='str'),
) )
@ -371,7 +361,7 @@ def main():
target_roles = module.params['target_roles'] target_roles = module.params['target_roles']
fail_on_role = module.params['fail_on_role'] fail_on_role = module.params['fail_on_role']
state = module.params['state'] state = module.params['state']
sslrootcert = module.params['ssl_rootcert'] sslrootcert = module.params['ca_cert']
session_role = module.params['session_role'] session_role = module.params['session_role']
# To use defaults values, keyword arguments must be absent, so # To use defaults values, keyword arguments must be absent, so
@ -384,7 +374,7 @@ def main():
"port": "port", "port": "port",
"db": "database", "db": "database",
"ssl_mode": "sslmode", "ssl_mode": "sslmode",
"ssl_rootcert": "sslrootcert" "ca_cert": "sslrootcert"
} }
kw = dict((params_map[k], v) for (k, v) in iteritems(module.params) kw = dict((params_map[k], v) for (k, v) in iteritems(module.params)
if k in params_map and v != '' and v is not None) if k in params_map and v != '' and v is not None)

View file

@ -108,18 +108,11 @@ options:
type: str type: str
default: prefer default: prefer
choices: [ allow, disable, prefer, require, verify-ca, verify-full ] choices: [ allow, disable, prefer, require, verify-ca, verify-full ]
ssl_rootcert:
description:
- Specifies the name of a file containing SSL certificate authority (CA)
certificate(s).
- If the file exists, the server's certificate will be
verified to be signed by one of these authorities.
type: str
ca_cert: ca_cert:
description: description:
- Specifies the name of a file containing SSL certificate authority (CA) - Specifies the name of a file containing SSL certificate authority (CA) certificate(s).
certificate(s). If the file exists, the server's certificate will be - If the file exists, the server's certificate will be verified to be signed by one of these authorities.
verified to be signed by one of these authorities. type: str
aliases: [ ssl_rootcert ] aliases: [ ssl_rootcert ]
notes: notes:

View file

@ -340,7 +340,7 @@ def main():
"login_password": "password", "login_password": "password",
"port": "port", "port": "port",
"sslmode": "ssl_mode", "sslmode": "ssl_mode",
"ssl_rootcert": "ssl_rootcert" "ca_cert": "ssl_rootcert"
} }
kw = dict((params_map[k], v) for (k, v) in module.params.items() kw = dict((params_map[k], v) for (k, v) in module.params.items()
if k in params_map and v != '') if k in params_map and v != '')