diff options
| author | Felix Fontein <felix@fontein.de> | 2019-10-12 14:09:03 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-10-12 10:01:40 -0700 |
| commit | 8b729d3d6fcc1c461e8be97fab0de95fc534f739 (patch) | |
| tree | 9dfef5d6eba67232e62330d5aaad3617cee33675 | |
| parent | ec82aa5d314564ee595040f6351e83af63278d40 (diff) | |
| download | ansible-8b729d3d6fcc1c461e8be97fab0de95fc534f739.tar.gz | |
docker_image: fix option parameter so that warnings are issued (#63345)
* Fix option parameter so that warnings are issued.
* Add changelog.
(cherry picked from commit 61b3784131260c6d76274b91a3c7a6a9174d2b92)
| -rw-r--r-- | changelogs/fragments/63345-docker_image-deprecation-warnings.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/cloud/docker/docker_image.py | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/changelogs/fragments/63345-docker_image-deprecation-warnings.yml b/changelogs/fragments/63345-docker_image-deprecation-warnings.yml new file mode 100644 index 0000000000..23fd9279c1 --- /dev/null +++ b/changelogs/fragments/63345-docker_image-deprecation-warnings.yml @@ -0,0 +1,2 @@ +bugfixes: +- "docker_image - make sure that deprecated options also emit proper deprecation warnings next to warnings which indicate how to replace them." diff --git a/lib/ansible/modules/cloud/docker/docker_image.py b/lib/ansible/modules/cloud/docker/docker_image.py index 8d5dc45827..f8cfa6e8b2 100644 --- a/lib/ansible/modules/cloud/docker/docker_image.py +++ b/lib/ansible/modules/cloud/docker/docker_image.py @@ -834,25 +834,25 @@ def main(): memswap=dict(type='int'), cpushares=dict(type='int'), cpusetcpus=dict(type='str'), - ), removedin_version='2.12'), - dockerfile=dict(type='str', removedin_version='2.12'), + ), removed_in_version='2.12'), + dockerfile=dict(type='str', removed_in_version='2.12'), force=dict(type='bool', removed_in_version='2.12'), force_source=dict(type='bool', default=False), force_absent=dict(type='bool', default=False), force_tag=dict(type='bool', default=False), - http_timeout=dict(type='int', removedin_version='2.12'), + http_timeout=dict(type='int', removed_in_version='2.12'), load_path=dict(type='path'), name=dict(type='str', required=True), - nocache=dict(type='bool', default=False, removedin_version='2.12'), - path=dict(type='path', aliases=['build_path'], removedin_version='2.12'), - pull=dict(type='bool', removedin_version='2.12'), + nocache=dict(type='bool', default=False, removed_in_version='2.12'), + path=dict(type='path', aliases=['build_path'], removed_in_version='2.12'), + pull=dict(type='bool', removed_in_version='2.12'), push=dict(type='bool', default=False), repository=dict(type='str'), - rm=dict(type='bool', default=True, removedin_version='2.12'), + rm=dict(type='bool', default=True, removed_in_version='2.12'), state=dict(type='str', default='present', choices=['absent', 'present', 'build']), tag=dict(type='str', default='latest'), use_tls=dict(type='str', choices=['no', 'encrypt', 'verify'], removed_in_version='2.11'), - buildargs=dict(type='dict', removedin_version='2.12'), + buildargs=dict(type='dict', removed_in_version='2.12'), ) required_if = [ |