diff --git a/changelogs/fragments/63420-docker_container-trust_image_content.yml b/changelogs/fragments/63420-docker_container-trust_image_content.yml new file mode 100644 index 00000000000..e5deb73142e --- /dev/null +++ b/changelogs/fragments/63420-docker_container-trust_image_content.yml @@ -0,0 +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." diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.10.rst b/docs/docsite/rst/porting_guides/porting_guide_2.10.rst index 1f5143aa413..4159cb6c473 100644 --- a/docs/docsite/rst/porting_guides/porting_guide_2.10.rst +++ b/docs/docsite/rst/porting_guides/porting_guide_2.10.rst @@ -55,6 +55,8 @@ The following functionality will be removed in Ansible 2.14. Please update updat * The :ref:`openssl_csr ` module's option ``version`` no longer supports values other than ``1`` (the current only standardized CSR version). +* :ref:`docker_container `: the ``trust_image_content`` option will be removed. It has always been ignored by the module. + Noteworthy module changes ------------------------- diff --git a/lib/ansible/modules/cloud/docker/docker_container.py b/lib/ansible/modules/cloud/docker/docker_container.py index 6529413bb15..93dae0ded0c 100644 --- a/lib/ansible/modules/cloud/docker/docker_container.py +++ b/lib/ansible/modules/cloud/docker/docker_container.py @@ -723,6 +723,7 @@ options: trust_image_content: description: - If C(yes), skip image verification. + - The option has never been used by the module. It will be removed in Ansible 2.14. type: bool default: no tmpfs: @@ -3264,7 +3265,7 @@ def main(): stop_timeout=dict(type='int'), sysctls=dict(type='dict'), tmpfs=dict(type='list', elements='str'), - trust_image_content=dict(type='bool', default=False), + trust_image_content=dict(type='bool', default=False, removed_in_version='2.14'), tty=dict(type='bool', default=False), ulimits=dict(type='list', elements='str'), user=dict(type='str'), diff --git a/test/integration/targets/docker_container/tasks/tests/options.yml b/test/integration/targets/docker_container/tasks/tests/options.yml index 638286b0c68..3ec843655e2 100644 --- a/test/integration/targets/docker_container/tasks/tests/options.yml +++ b/test/integration/targets/docker_container/tasks/tests/options.yml @@ -3376,12 +3376,6 @@ avoid such warnings, please quote the value.' in log_options_2.warnings" - tmpfs_3 is not changed - tmpfs_4 is changed -#################################################################### -## trust_image_content ############################################# -#################################################################### - -# TODO: - trust_image_content - #################################################################### ## tty ############################################################# ####################################################################