ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Remove deprecated features scheduled for removal in 3.0.0 (#1926)

Browse source 
* Remove deprecated features.

* Remove ignore.txt entries.

* Update changelogs/fragments/remove-deprecated-features.yml

Co-authored-by: Joe Adams <adams10301@gmail.com>

Co-authored-by: Joe Adams <adams10301@gmail.com>
This commit is contained in:
Felix Fontein 2021-03-09 21:23:20 +01:00 • committed by GitHub
parent 1ca9229c66
commit 36daa7c48e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,9 +46,8 @@ options:
description:
- CA certificate string used to validate the feed source SSL certificate.
This can be the file content or the path to the file.
The ca_cert alias will be removed in community.general 3.0.0.
type: str
aliases: [ importer_ssl_ca_cert, ca_cert ]
aliases: [ importer_ssl_ca_cert ]
feed_client_cert:
description:
- Certificate used as the client certificate when synchronizing the
@ -57,8 +56,6 @@ options:
certificate. The specified file may be the certificate itself or a
single file containing both the certificate and private key. This can be
the file content or the path to the file.
- If not specified the default value will come from client_cert. Which will
change in community.general 3.0.0.
type: str
aliases: [ importer_ssl_client_cert ]
feed_client_key:
@ -66,8 +63,6 @@ options:
- 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
the file content or the path to the file.
- If not specified the default value will come from client_key. Which will
change in community.general 3.0.0.
type: str
aliases: [ importer_ssl_client_key ]
name:
@ -541,9 +536,7 @@ 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='3.0.0',
collection_name='community.general')]), # was Ansible 2.14
feed_ca_cert=dict(aliases=['importer_ssl_ca_cert']),
feed_client_cert=dict(aliases=['importer_ssl_client_cert']),
feed_client_key=dict(aliases=['importer_ssl_client_key'], no_log=True),
name=dict(required=True, aliases=['repo']),
@ -571,19 +564,7 @@ def main():
generate_sqlite = module.params['generate_sqlite']
importer_ssl_ca_cert = module.params['feed_ca_cert']
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 the "
"Pulp instance, use the new options `feed_client_cert` and `feed_client_key` (available since "
"Ansible 2.9.2). Until community.general 3.0.0, the default value for `feed_client_cert` will be "
"taken from `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 community.general 3.0.0 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']