ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-11 11:41:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Adjust removal versions (#521)

Browse source 
* Adjust 2.11 and later Ansible versions to collection versions.

* Remove unnecessary changelog.

* Adjust Ansible 2.10 to community.general 0.2.0 (first 'proper' release).

* Caught some non-properly prefixed versions.

* Update plugins/modules/database/mysql/mysql_replication.py
This commit is contained in:
Felix Fontein 2020-06-16 21:24:42 +02:00 • committed by GitHub
parent 7ef43c60df
commit f16a93f976
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ 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 Ansible 2.14.
The ca_cert alias will be removed in community.general 3.0.0.
type: str
aliases: [ importer_ssl_ca_cert, ca_cert ]
feed_client_cert:
@ -57,7 +57,7 @@ options:
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 Ansible 2.14.
change in community.general 3.0.0.
type: str
aliases: [ importer_ssl_client_cert ]
feed_client_key:
@ -66,7 +66,7 @@ options:
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 Ansible 2.14.
change in community.general 3.0.0.
type: str
aliases: [ importer_ssl_client_key ]
name:
@ -564,13 +564,14 @@ def main():
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 Ansible 2.14, the default value for `feed_client_cert` will be taken from "
"`client_cert` if only the latter is specified",
"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 2.14 the default value will come from client_key option",
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']