From 5242914ae5ac15ea5d5e7ba3607bb6c8eb9c72a6 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Sat, 17 Feb 2018 22:48:52 +0530 Subject: [PATCH] Fix digital ocean issues (#36347) Remove module from ignore lists and some documentation fix in digital_ocean_block_storage and digital_ocean module. Signed-off-by: Abhijeet Kasurde --- .../cloud/digital_ocean/digital_ocean_block_storage.py | 3 +-- lib/ansible/utils/module_docs_fragments/digital_ocean.py | 1 + test/sanity/validate-modules/ignore.txt | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_block_storage.py b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_block_storage.py index 4c5f27079bc..ead6ef194b1 100644 --- a/lib/ansible/modules/cloud/digital_ocean/digital_ocean_block_storage.py +++ b/lib/ansible/modules/cloud/digital_ocean/digital_ocean_block_storage.py @@ -268,8 +268,7 @@ def main(): description=dict(type='str'), region=dict(type='str', required=False), snapshot_id=dict(type='str', required=False), - droplet_id=dict(type='int'), - timeout=dict(type='int', default=10) + droplet_id=dict(type='int') ) module = AnsibleModule(argument_spec=argument_spec) diff --git a/lib/ansible/utils/module_docs_fragments/digital_ocean.py b/lib/ansible/utils/module_docs_fragments/digital_ocean.py index 52da7d75799..3b08abbab3b 100644 --- a/lib/ansible/utils/module_docs_fragments/digital_ocean.py +++ b/lib/ansible/utils/module_docs_fragments/digital_ocean.py @@ -22,5 +22,6 @@ options: - If set to C(no), the SSL certificates will not be validated. - This should only set to C(no) used on personally controlled sites using self-signed certificates. default: true + type: bool ''' diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 2f50b7e4d7a..ca9260499d5 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -667,20 +667,14 @@ lib/ansible/modules/cloud/digital_ocean/digital_ocean.py E322 lib/ansible/modules/cloud/digital_ocean/digital_ocean.py E324 lib/ansible/modules/cloud/digital_ocean/digital_ocean.py E325 lib/ansible/modules/cloud/digital_ocean/digital_ocean.py E326 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_block_storage.py E322 lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E322 lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E324 lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip.py E325 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip_facts.py E322 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip_facts.py E324 lib/ansible/modules/cloud/digital_ocean/digital_ocean_floating_ip_facts.py E325 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/digital_ocean/digital_ocean_sshkey.py E325 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py E322 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py E324 lib/ansible/modules/cloud/digital_ocean/digital_ocean_sshkey_facts.py E325 -lib/ansible/modules/cloud/digital_ocean/digital_ocean_tag.py E322 lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py E325 lib/ansible/modules/cloud/dimensiondata/dimensiondata_network.py E326 lib/ansible/modules/cloud/dimensiondata/dimensiondata_vlan.py E324