diff --git a/lib/ansible/module_utils/docker/common.py b/lib/ansible/module_utils/docker/common.py index edc819e984..23ee070ac4 100644 --- a/lib/ansible/module_utils/docker/common.py +++ b/lib/ansible/module_utils/docker/common.py @@ -80,9 +80,9 @@ DOCKER_COMMON_ARGS = dict( tls_hostname=dict(type='str', default=DEFAULT_TLS_HOSTNAME, fallback=(env_fallback, ['DOCKER_TLS_HOSTNAME'])), api_version=dict(type='str', aliases=['docker_api_version'], default='auto', fallback=(env_fallback, ['DOCKER_API_VERSION'])), timeout=dict(type='int', default=DEFAULT_TIMEOUT_SECONDS, fallback=(env_fallback, ['DOCKER_TIMEOUT'])), - cacert_path=dict(type='str', aliases=['tls_ca_cert']), - cert_path=dict(type='str', aliases=['tls_client_cert']), - key_path=dict(type='str', aliases=['tls_client_key']), + cacert_path=dict(type='path', aliases=['tls_ca_cert']), + cert_path=dict(type='path', aliases=['tls_client_cert']), + key_path=dict(type='path', aliases=['tls_client_key']), ssl_version=dict(type='str', fallback=(env_fallback, ['DOCKER_SSL_VERSION'])), tls=dict(type='bool', default=DEFAULT_TLS, fallback=(env_fallback, ['DOCKER_TLS'])), tls_verify=dict(type='bool', default=DEFAULT_TLS_VERIFY, fallback=(env_fallback, ['DOCKER_TLS_VERIFY'])), diff --git a/lib/ansible/modules/cloud/docker/docker_swarm_service.py b/lib/ansible/modules/cloud/docker/docker_swarm_service.py index 5bbf216834..2b0114b700 100644 --- a/lib/ansible/modules/cloud/docker/docker_swarm_service.py +++ b/lib/ansible/modules/cloud/docker/docker_swarm_service.py @@ -370,7 +370,7 @@ options: - Rolling update parallelism. - Corresponds to the C(--update-parallelism) option of C(docker service create). update_failure_action: - type: int + type: str description: - Action to take in case of container failure. - Corresponds to the C(--update-failure-action) option of C(docker service create). diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 02b8c0a69f..364c9c4731 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -123,26 +123,6 @@ lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey.py E322 lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey.py E324 lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py E326 lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py E326 -lib/ansible/modules/cloud/docker/docker_compose.py E325 -lib/ansible/modules/cloud/docker/docker_config.py E325 -lib/ansible/modules/cloud/docker/docker_container.py E325 -lib/ansible/modules/cloud/docker/docker_container_facts.py E325 -lib/ansible/modules/cloud/docker/docker_host_facts.py E325 -lib/ansible/modules/cloud/docker/docker_image.py E325 -lib/ansible/modules/cloud/docker/docker_image_facts.py E325 -lib/ansible/modules/cloud/docker/docker_login.py E325 -lib/ansible/modules/cloud/docker/docker_network.py E325 -lib/ansible/modules/cloud/docker/docker_network_facts.py E325 -lib/ansible/modules/cloud/docker/docker_node.py E325 -lib/ansible/modules/cloud/docker/docker_node_facts.py E325 -lib/ansible/modules/cloud/docker/docker_prune.py E325 -lib/ansible/modules/cloud/docker/docker_secret.py E325 -lib/ansible/modules/cloud/docker/docker_swarm.py E325 -lib/ansible/modules/cloud/docker/docker_swarm_facts.py E325 -lib/ansible/modules/cloud/docker/docker_swarm_service.py E325 -lib/ansible/modules/cloud/docker/docker_swarm_service.py E335 -lib/ansible/modules/cloud/docker/docker_volume.py E325 -lib/ansible/modules/cloud/docker/docker_volume_facts.py E325 lib/ansible/modules/cloud/google/gc_storage.py E322 lib/ansible/modules/cloud/google/gc_storage.py E324 lib/ansible/modules/cloud/google/gc_storage.py E326