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

#59522: adjust messages (#65129)

Browse source 
* Adjust messages.

* Fix one more.
This commit is contained in:
Felix Fontein 2019-11-21 17:20:38 +01:00 committed by GitHub
parent c08f536260
commit d1c58bc942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/59522-renamed-module-tls-client-auth-params-to-avoid-overlaping-with-fetch_url.yaml
View file

@ -1,2 +1,2 @@
bugfixes:
- pulp_repo - the ``client_cert`` and ``client_key`` options were used for both requests to pulp.io and for the repo to sync with, resulting in errors when they were used. Use the new options ``feed_client_cert`` and ``feed_client_key`` for client certificates that should only be used for repo synchronisation, and not for communication with pulp.io. (https://github.com/ansible/ansible/issues/59513)
- pulp_repo - the ``client_cert`` and ``client_key`` options were used for both requests to the Pulp instance and for the repo to sync with, resulting in errors when they were used. Use the new options ``feed_client_cert`` and ``feed_client_key`` for client certificates that should only be used for repo synchronisation, and not for communication with the Pulp instance. (https://github.com/ansible/ansible/issues/59513)

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

@ -572,9 +572,10 @@ def main():
importer_ssl_client_cert = module.params['feed_client_cert']
if importer_ssl_client_cert is None and module.params['client_cert'] is not None:
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 pulp.io, 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 `client_cert` if only the latter is specified"), version="2.14")
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 "
"Ansible 2.10). 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")
importer_ssl_client_key = module.params['feed_client_key']
if importer_ssl_client_key is None and module.params['client_key'] is not None:
importer_ssl_client_key = module.params['client_key']