wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2.10 -> 2.9.2 (#65517)

Browse source
This commit is contained in:
Felix Fontein 2019-12-08 15:14:24 +01:00 committed by GitHub
parent 965474841f
commit 717c0da32b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/packaging/os/pulp_repo.py
View file

@ -56,7 +56,7 @@ options:
type: str type: str
aliases: [ importer_ssl_ca_cert, ca_cert ] aliases: [ importer_ssl_ca_cert, ca_cert ]
feed_client_cert: feed_client_cert:
version_added: "2.10" version_added: "2.9.2"
description: description:
- Certificate used as the client certificate when synchronizing the - Certificate used as the client certificate when synchronizing the
repository. This is used to communicate authentication information to repository. This is used to communicate authentication information to
@ -69,7 +69,7 @@ options:
type: str type: str
aliases: [ importer_ssl_client_cert ] aliases: [ importer_ssl_client_cert ]
feed_client_key: feed_client_key:
version_added: "2.10" version_added: "2.9.2"
description: description:
- Private key to the certificate specified in I(importer_ssl_client_cert), - Private key to the certificate specified in I(importer_ssl_client_cert),
assuming it is not included in the certificate file itself. This can be assuming it is not included in the certificate file itself. This can be
@ -574,12 +574,12 @@ def main():
importer_ssl_client_cert = module.params['client_cert'] importer_ssl_client_cert = module.params['client_cert']
module.deprecate("To specify client certificates to be used with the repo to sync, and not for communication with the " module.deprecate("To specify client certificates to be used with the repo to sync, and not for communication with the "
"Pulp instance, use the new options `feed_client_cert` and `feed_client_key` (available since " "Pulp instance, use the new options `feed_client_cert` and `feed_client_key` (available since "
"Ansible 2.10). Until Ansible 2.14, the default value for `feed_client_cert` will be taken from " "Ansible 2.9.2). Until Ansible 2.14, the default value for `feed_client_cert` will be taken from "
"`client_cert` if only the latter is specified", version="2.14") "`client_cert` if only the latter is specified", version="2.14")
importer_ssl_client_key = module.params['feed_client_key'] importer_ssl_client_key = module.params['feed_client_key']
if importer_ssl_client_key is None and module.params['client_key'] is not None: if importer_ssl_client_key is None and module.params['client_key'] is not None:
importer_ssl_client_key = module.params['client_key'] importer_ssl_client_key = module.params['client_key']
module.deprecate("In Ansible 2.10 `feed_client_key` option was added. Until 2.14 the default value will come from client_key option", version="2.14") module.deprecate("In Ansible 2.9.2 `feed_client_key` option was added. Until 2.14 the default value will come from client_key option", version="2.14")
proxy_host = module.params['proxy_host'] proxy_host = module.params['proxy_host']
proxy_port = module.params['proxy_port'] proxy_port = module.params['proxy_port']
proxy_username = module.params['proxy_username'] proxy_username = module.params['proxy_username']