ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-30 15:38:53 +00:00
Code Activity

Adjust deprecation versions.

Browse source
This commit is contained in:
Felix Fontein 2020-06-13 16:51:18 +02:00
parent f9589d78a8
commit 7bb008a964
136 changed files with 549 additions and 678 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/modules/packaging/os/pulp_repo.py
View file

@ -530,7 +530,9 @@ def main():
add_export_distributor=dict(default=False, type='bool'),
feed=dict(),
generate_sqlite=dict(default=False, type='bool'),
feed_ca_cert=dict(aliases=['importer_ssl_ca_cert', 'ca_cert'], deprecated_aliases=[dict(name='ca_cert', version='2.14')]),
feed_ca_cert=dict(aliases=['importer_ssl_ca_cert', 'ca_cert'],
deprecated_aliases=[dict(name='ca_cert', version='3.0.0',
collection_name='community.general')]), # was Ansible 2.14
feed_client_cert=dict(aliases=['importer_ssl_client_cert']),
feed_client_key=dict(aliases=['importer_ssl_client_key']),
name=dict(required=True, aliases=['repo']),
@ -563,11 +565,13 @@ def main():
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.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="3.0.0", collection_name='community.general') # was Ansible 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']
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")
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="3.0.0", collection_name='community.general') # was Ansible 2.14
proxy_host = module.params['proxy_host']
proxy_port = module.params['proxy_port']
proxy_username = module.params['proxy_username']