Adjust removal versions (#521)

* 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

changelogs/fragments/124-airbrake_deployments-api_v4_for_deploy_notices.yml

@@ -5,4 +5,4 @@ minor_changes:
 - "airbrake_deployment - Allow passing ``project_id`` and ``project_key`` for v4 api deploy compatibility"
 
 deprecated_features:
-- "airbrake_deployment - Add deprecation notice for ``token`` parameter and v2 api deploys. This feature will be removed in Ansible 2.14"
+- "airbrake_deployment - Add deprecation notice for ``token`` parameter and v2 api deploys. This feature will be removed in community.general 3.0.0."  # was Ansible 2.14

changelogs/fragments/202-jenkins_plugin-fix-import.yml

@@ -1,2 +0,0 @@
-bugfixes:
-- jenkins_plugin - make compatible to Ansible 2.10 by fixing import.

changelogs/fragments/63419-docker_container-defaults.yml

@@ -1,4 +1,4 @@
 minor_changes:
 - "docker_container - add new ``container_default_behavior`` option (PR https://github.com/ansible/ansible/pull/63419)."
 deprecated_features:
-- "docker_container - the default of ``container_default_behavior`` will change from ``compatibility`` to ``no_defaults`` in Ansible 2.14. Set the option to an explicit value to avoid a deprecation warning."
+- "docker_container - the default of ``container_default_behavior`` will change from ``compatibility`` to ``no_defaults`` in community.general 3.0.0. Set the option to an explicit value to avoid a deprecation warning."  # was Ansible 2.14

changelogs/fragments/63420-docker_container-trust_image_content.yml

@@ -1,2 +1,2 @@
 deprecated_features:
-- "docker_container - the ``trust_image_content`` option is now deprecated and will be removed in Ansible 2.14. It has never been used by the module."
+- "docker_container - the ``trust_image_content`` option is now deprecated and will be removed in community.general 3.0.0. It has never been used by the module."  # was Ansible 2.14

changelogs/fragments/63467-docker-stack-return-fix.yml

@@ -2,4 +2,4 @@ minor_changes:
   - docker_stack - Added ``stdout``, ``stderr``, and ``rc`` to return values.
 
 deprecated_features:
-  - docker_stack - Return values ``out`` and ``err`` have been deprecated and will be removed in Ansible 2.14. Use ``stdout`` and ``stderr`` instead.
+  - "docker_stack - Return values ``out`` and ``err`` have been deprecated and will be removed in community.general 3.0.0. Use ``stdout`` and ``stderr`` instead."  # was Ansible 2.14

changelogs/fragments/64635-docker_container-network_mode.yml

@@ -1,2 +1,2 @@
 deprecated_features:
-- "docker_container - the default value for ``network_mode`` will change in Ansible 2.14, provided at least one network is specified and ``networks_cli_compatible`` is ``true``. See porting guide, module documentation or deprecation warning for more details."
+- "docker_container - the default value for ``network_mode`` will change in community.general 3.0.0, provided at least one network is specified and ``networks_cli_compatible`` is ``true``. See porting guide, module documentation or deprecation warning for more details."  # was Ansible 2.14

changelogs/fragments/66837-zabbix-proxy-interface.yml

@@ -1,2 +1,2 @@
 minor_changes:
-  - zabbix_proxy - ``interface`` sub-options ``type`` and ``main`` are now deprecated and will be removed in Ansible 2.14. Also, the values passed to ``interface`` are now checked for correct types and unexpected keys.
+  - "zabbix_proxy - ``interface`` sub-options ``type`` and ``main`` are now deprecated and will be removed in community.general 3.0.0. Also, the values passed to ``interface`` are now checked for correct types and unexpected keys."  # was Ansible 2.14

changelogs/fragments/clc_aa_policy-remove-unused-wait-parameter.yaml

@@ -1,2 +1,2 @@
 deprecated_features:
-  - "clc_aa_policy - The ``wait`` option had no effect and will be removed in Ansible 2.14"
+  - "clc_aa_policy - The ``wait`` option had no effect and will be removed in community.general 3.0.0."  # was Ansible 2.14

plugins/lookup/hashi_vault.py

@@ -22,9 +22,9 @@ DOCUMENTATION = """
     - Retrieve secrets from HashiCorp's vault.
   notes:
     - Due to a current limitation in the HVAC library there won't necessarily be an error if a bad endpoint is specified.
-    - As of Ansible 2.10, only the latest version of a secret is returned when specifying a KV v2 path.
+    - As of community.general 0.2.0, only the latest version of a secret is returned when specifying a KV v2 path.
-    - As of Ansible 2.10, all options can be supplied via term string (space delimited key=value pairs) or by parameters (see examples).
+    - As of community.general 0.2.0, all options can be supplied via term string (space delimited key=value pairs) or by parameters (see examples).
-    - As of Ansible 2.10, when C(secret) is the first option in the term string, C(secret=) is not required (see examples).
+    - As of community.general 0.2.0, when C(secret) is the first option in the term string, C(secret=) is not required (see examples).
   options:
     secret:
       description: query you are making.
@@ -79,7 +79,7 @@ DOCUMENTATION = """
       description:
         - Authentication method to be used.
         - C(userpass) is added in Ansible 2.8.
-        - C(aws_iam_login) is added in Ansible 2.10.
+        - C(aws_iam_login) is added in community.general 0.2.0.
       env:
         - name: VAULT_AUTH_METHOD
       ini:
@@ -96,7 +96,7 @@ DOCUMENTATION = """
     return_format:
       description:
         - Controls how multiple key/value pairs in a path are treated on return.
-        - C(dict) returns a single dict containing the key/value pairs (same behavior as before Ansible 2.10).
+        - C(dict) returns a single dict containing the key/value pairs (same behavior as before community.general 0.2.0).
         - C(values) returns a list of all the values only. Use when you don't care about the keys.
         - C(raw) returns the actual API result, which includes metadata and may have the data nested in other keys.
       choices:
@@ -198,7 +198,7 @@ EXAMPLES = """
   debug:
     msg: "{{ lookup('community.general.hashi_vault', 'secret=secret/data/hello token=my_vault_token url=http://myvault_url:8200') }}"
 
-# The following examples work in collection releases after Ansible 2.10
+# The following examples work in collection releases after community.general 0.2.0
 
 - name: secret= is not required if secret is first
   debug:

plugins/modules/cloud/smartos/vmadm.py

@@ -30,7 +30,7 @@ options:
     choices: [ joyent, joyent-minimal, lx, kvm, bhyve ]
     default: joyent
     description:
-      - Type of virtual machine. The C(bhyve) option was added in Ansible 2.10.
+      - Type of virtual machine. The C(bhyve) option was added in community.general 0.2.0.
   boot:
     required: false
     description:

plugins/modules/database/mysql/mysql_replication.py

@@ -28,7 +28,7 @@ options:
       C(getslave) (SHOW SLAVE STATUS),
       C(startslave) (START SLAVE),
       C(stopslave) (STOP SLAVE),
-      C(resetmaster) (RESET MASTER) - supported from Ansible 2.10,
+      C(resetmaster) (RESET MASTER) - supported since community.general 0.2.0,
       C(resetslave) (RESET SLAVE),
       C(resetslaveall) (RESET SLAVE ALL).
     type: str

plugins/modules/database/postgresql/postgresql_pg_hba.py

@@ -79,7 +79,7 @@ options:
       - The entries will be written out in a specific order.
         With this option you can control by which field they are ordered first, second and last.
         s=source, d=databases, u=users.
-        This option is deprecated since 2.9 and will be removed in 2.11.
+        This option is deprecated since 2.9 and will be removed in community.general 3.0.0.
         Sortorder is now hardcoded to sdu.
     type: str
     default: sdu
@@ -670,7 +670,8 @@ def main():
         method=dict(type='str', default='md5', choices=PG_HBA_METHODS),
         netmask=dict(type='str'),
         options=dict(type='str'),
-        order=dict(type='str', default="sdu", choices=PG_HBA_ORDERS),
+        order=dict(type='str', default="sdu", choices=PG_HBA_ORDERS,
+                   removed_in_version='3.0.0', removed_from_collection='community.general'),
         state=dict(type='str', default="present", choices=["absent", "present"]),
         users=dict(type='str', default='all')
     )

plugins/modules/database/postgresql/postgresql_privs.py

@@ -330,7 +330,7 @@ EXAMPLES = r'''
     type: foreign_data_wrapper
     role: reader
 
-# Available since Ansible 2.10
+# Available since community.general 0.2.0
 - name: GRANT ALL PRIVILEGES ON TYPE customtype TO reader
   postgresql_privs:
     db: test
@@ -390,7 +390,7 @@ EXAMPLES = r'''
     role: reader
     target_roles: librarian
 
-# Available since Ansible 2.10
+# Available since community.general 0.2.0
 - name: Grant type privileges for pg_catalog.numeric type to alice
   postgresql_privs:
     type: type

plugins/modules/files/archive.py

@@ -554,7 +554,7 @@ def main():
     try:
         file_args = module.load_file_common_arguments(params, path=b_dest)
     except TypeError:
-        # The path argument is only supported in Ansible 2.10+. Fall back to
+        # The path argument is only supported in Ansible-base 2.10+. Fall back to
         # pre-2.10 behavior for older Ansible versions.
         params['path'] = b_dest
         file_args = module.load_file_common_arguments(params)

plugins/modules/monitoring/airbrake_deployment.py

@@ -17,7 +17,7 @@ author:
 short_description: Notify airbrake about app deployments
 description:
    - Notify airbrake about app deployments (see U(https://airbrake.io/docs/api/#deploys-v4)).
-   - Parameter I(token) has been deprecated for Ansible 2.10. Please remove entry.
+   - Parameter I(token) has been deprecated for community.general 0.2.0. Please remove entry.
 options:
   project_id:
     description:
@@ -66,7 +66,7 @@ options:
     type: bool
   token:
      description:
-      - This parameter (API token) has been deprecated in Ansible 2.10. Please remove it from your tasks.
+      - This parameter (API token) has been deprecated in community.general 0.2.0. Please remove it from your tasks.
      required: false
      type: str
 
@@ -131,7 +131,8 @@ def main():
         if module.params["revision"]:
             params["deploy[scm_revision]"] = module.params["revision"]
 
-        module.deprecate("Parameter 'token' is deprecated in 2.10. Please remove it and use 'project_id' and 'project_key' instead",
+        module.deprecate("Parameter 'token' is deprecated since community.general 0.2.0. Please remove "
+                         "it and use 'project_id' and 'project_key' instead",
                          version='3.0.0', collection_name='community.general')  # was Ansible 2.14
 
         params["api_key"] = module.params["token"]

plugins/modules/monitoring/bigpanda.py

@@ -66,7 +66,7 @@ options:
   deployment_message:
     description:
     - Message about the deployment.
-    - C(message) alias is deprecated in Ansible 2.10, since it is used internally by Ansible Core Engine.
+    - C(message) alias is deprecated in community.general 0.2.0, since it is used internally by Ansible Core Engine.
     aliases: ['message']
     version_added: '0.2.0'
 

plugins/modules/monitoring/datadog/datadog_monitor.py

@@ -66,7 +66,7 @@ options:
           - A message to include with notifications for this monitor.
           - Email notifications can be sent to specific users by using the same '@username' notation as events.
           - Monitor message template variables can be accessed by using double square brackets, i.e '[[' and ']]'.
-          - C(message) alias is deprecated in Ansible 2.10, since it is used internally by Ansible Core Engine.
+          - C(message) alias is deprecated in community.general 0.2.0, since it is used internally by Ansible Core Engine.
         type: str
         aliases: [ 'message' ]
     silenced:

plugins/modules/net_tools/ldap/ldap_attr.py

@@ -35,7 +35,7 @@ notes:
 deprecated:
   removed_in: 3.0.0  # was Ansible 2.14
   why: 'The current "ldap_attr" module does not support LDAP attribute insertions or deletions with objectClass dependencies.'
-  alternative: 'Use M(ldap_attrs) instead. Deprecated in Ansible 2.10.'
+  alternative: 'Use M(ldap_attrs) instead. Deprecated in community.general 0.2.0.'
 author:
   - Jiri Tyr (@jtyr)
 requirements:

plugins/modules/packaging/os/pulp_repo.py

@@ -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 "
+                         "Ansible 2.9.2). Until community.general 3.0.0, the default value for `feed_client_cert` will be "
-                         "`client_cert` if only the latter is specified",
+                         "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']

plugins/modules/source_control/gitlab/gitlab_user.py

@@ -18,7 +18,7 @@ description:
   - When the user exists and state=blocked, the user will be blocked.
   - When changes are made to user, the user will be updated.
 notes:
-  - From Ansible 2.10 and onwards, name, email and password are optional while deleting the user.
+  - From community.general 0.2.0 and onwards, name, email and password are optional while deleting the user.
 author:
   - Werner Dijkerman (@dj-wasabi)
   - Guillaume Martinez (@Lunik)

plugins/modules/system/java_keystore.py

@@ -247,7 +247,7 @@ def update_jks_perm(module, keystore_path):
     try:
         file_args = module.load_file_common_arguments(module.params, path=keystore_path)
     except TypeError:
-        # The path argument is only supported in Ansible-baes 2.10+. Fall back to
+        # The path argument is only supported in Ansible-base 2.10+. Fall back to
         # pre-2.10 behavior for older Ansible versions.
         module.params['path'] = keystore_path
         file_args = module.load_file_common_arguments(module.params)