diff options
| author | Jordan Borean <jborean93@gmail.com> | 2020-06-10 16:33:08 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-10 16:33:08 +1000 |
| commit | 15f07e7a6c2fd8a1b5c9ac7fb9c2a6d3e4008635 (patch) | |
| tree | a7f890306895aed5c019b6cd352bafd71accb15f /lib | |
| parent | a81dd4f06a4a424496f55d89ebd52962c3204847 (diff) | |
| download | ansible-15f07e7a6c2fd8a1b5c9ac7fb9c2a6d3e4008635.tar.gz | |
Fix up schema for collection deprecation (#69977)
* Fix up schema for collection deprecation
* Fix up modules using wrong name
* Another fix
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ansible/module_utils/basic.py | 2 | ||||
| -rw-r--r-- | lib/ansible/module_utils/urls.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/module_utils/basic.py b/lib/ansible/module_utils/basic.py index 3381848238..5b896cf422 100644 --- a/lib/ansible/module_utils/basic.py +++ b/lib/ansible/module_utils/basic.py @@ -2063,7 +2063,7 @@ class AnsibleModule(object): self.deprecate(d[0], version=d[1]) elif isinstance(d, Mapping): self.deprecate(d['msg'], version=d.get('version'), date=d.get('date'), - collection_name=d.get('date')) + collection_name=d.get('collection_name')) else: self.deprecate(d) # pylint: disable=ansible-deprecated-no-version else: diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index 0fa6b7180c..a239da411f 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -1529,7 +1529,7 @@ def url_argument_spec(): return dict( url=dict(type='str'), force=dict(type='bool', default=False, aliases=['thirsty'], - deprecated_aliases=[dict(name='thirsty', version='2.13', collection='ansible.builtin')]), + deprecated_aliases=[dict(name='thirsty', version='2.13', collection_name='ansible.builtin')]), http_agent=dict(type='str', default='ansible-httpget'), use_proxy=dict(type='bool', default=True), validate_certs=dict(type='bool', default=True), |