From 8b52006d5c52baa908c3aabdad55a8d78d25ac2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Santos?= Date: Mon, 26 Feb 2018 13:05:53 +0000 Subject: [PATCH] Fix sanity checks in OpenStack docs fragment (#36722) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix sanity checks in OpenStack docs fragment Signed-off-by: Mário Santos --- .../utils/module_docs_fragments/openstack.py | 15 ++-- test/sanity/validate-modules/ignore.txt | 79 ------------------- 2 files changed, 5 insertions(+), 89 deletions(-) diff --git a/lib/ansible/utils/module_docs_fragments/openstack.py b/lib/ansible/utils/module_docs_fragments/openstack.py index 51c9299a350..87eb0ca46db 100644 --- a/lib/ansible/utils/module_docs_fragments/openstack.py +++ b/lib/ansible/utils/module_docs_fragments/openstack.py @@ -47,7 +47,6 @@ options: password authentication, the name of the plugin should be indicated here and the contents of the I(auth) parameter should be updated accordingly. required: false - default: password region_name: description: - Name of the region. @@ -55,9 +54,9 @@ options: wait: description: - Should ansible wait until the requested resource is complete. + type: bool required: false - default: "yes" - choices: ["yes", "no"] + default: true timeout: description: - How long should ansible wait for the requested resource. @@ -68,29 +67,25 @@ options: - How long should the socket layer wait before timing out for API calls. If this is omitted, nothing will be passed to the requests library. required: false - default: None - validate_certs: + verify: description: - Whether or not SSL API requests should be verified. Before 2.3 this defaulted to True. + type: bool required: false - default: null - aliases: ['verify'] + aliases: ['validate_certs'] cacert: description: - A path to a CA Cert bundle that can be used as part of verifying SSL API requests. required: false - default: None cert: description: - A path to a client certificate to use as part of the SSL transaction. required: false - default: None key: description: - A path to a client key to use as part of the SSL transaction. required: false - default: None interface: description: - Endpoint URL type to fetch from the service catalog. diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt index 82c591cec3c..ff77b806090 100644 --- a/test/sanity/validate-modules/ignore.txt +++ b/test/sanity/validate-modules/ignore.txt @@ -599,147 +599,68 @@ lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E325 lib/ansible/modules/cloud/oneandone/oneandone_public_ip.py E326 lib/ansible/modules/cloud/oneandone/oneandone_server.py E325 lib/ansible/modules/cloud/oneandone/oneandone_server.py E326 -lib/ansible/modules/cloud/openstack/os_auth.py E324 -lib/ansible/modules/cloud/openstack/os_auth.py E325 -lib/ansible/modules/cloud/openstack/os_auth.py E326 lib/ansible/modules/cloud/openstack/os_flavor_facts.py E324 -lib/ansible/modules/cloud/openstack/os_flavor_facts.py E325 -lib/ansible/modules/cloud/openstack/os_flavor_facts.py E326 lib/ansible/modules/cloud/openstack/os_floating_ip.py E324 lib/ansible/modules/cloud/openstack/os_floating_ip.py E325 -lib/ansible/modules/cloud/openstack/os_floating_ip.py E326 lib/ansible/modules/cloud/openstack/os_group.py E324 -lib/ansible/modules/cloud/openstack/os_group.py E325 -lib/ansible/modules/cloud/openstack/os_group.py E326 lib/ansible/modules/cloud/openstack/os_image.py E324 lib/ansible/modules/cloud/openstack/os_image.py E325 lib/ansible/modules/cloud/openstack/os_image.py E326 -lib/ansible/modules/cloud/openstack/os_image_facts.py E324 -lib/ansible/modules/cloud/openstack/os_image_facts.py E325 -lib/ansible/modules/cloud/openstack/os_image_facts.py E326 lib/ansible/modules/cloud/openstack/os_ironic.py E322 lib/ansible/modules/cloud/openstack/os_ironic.py E323 lib/ansible/modules/cloud/openstack/os_ironic.py E324 lib/ansible/modules/cloud/openstack/os_ironic.py E325 lib/ansible/modules/cloud/openstack/os_ironic.py E326 -lib/ansible/modules/cloud/openstack/os_ironic_inspect.py E324 -lib/ansible/modules/cloud/openstack/os_ironic_inspect.py E325 -lib/ansible/modules/cloud/openstack/os_ironic_inspect.py E326 lib/ansible/modules/cloud/openstack/os_ironic_node.py E322 lib/ansible/modules/cloud/openstack/os_ironic_node.py E324 -lib/ansible/modules/cloud/openstack/os_ironic_node.py E325 lib/ansible/modules/cloud/openstack/os_ironic_node.py E326 lib/ansible/modules/cloud/openstack/os_keypair.py E324 -lib/ansible/modules/cloud/openstack/os_keypair.py E325 -lib/ansible/modules/cloud/openstack/os_keypair.py E326 lib/ansible/modules/cloud/openstack/os_keystone_domain.py E324 lib/ansible/modules/cloud/openstack/os_keystone_domain.py E325 -lib/ansible/modules/cloud/openstack/os_keystone_domain.py E326 lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py E324 -lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py E325 -lib/ansible/modules/cloud/openstack/os_keystone_domain_facts.py E326 lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E322 -lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E324 lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E325 lib/ansible/modules/cloud/openstack/os_keystone_endpoint.py E326 -lib/ansible/modules/cloud/openstack/os_keystone_role.py E324 -lib/ansible/modules/cloud/openstack/os_keystone_role.py E325 -lib/ansible/modules/cloud/openstack/os_keystone_role.py E326 lib/ansible/modules/cloud/openstack/os_keystone_service.py E324 lib/ansible/modules/cloud/openstack/os_keystone_service.py E325 -lib/ansible/modules/cloud/openstack/os_keystone_service.py E326 lib/ansible/modules/cloud/openstack/os_network.py E324 lib/ansible/modules/cloud/openstack/os_network.py E325 -lib/ansible/modules/cloud/openstack/os_network.py E326 -lib/ansible/modules/cloud/openstack/os_networks_facts.py E324 -lib/ansible/modules/cloud/openstack/os_networks_facts.py E325 -lib/ansible/modules/cloud/openstack/os_networks_facts.py E326 lib/ansible/modules/cloud/openstack/os_nova_flavor.py E324 lib/ansible/modules/cloud/openstack/os_nova_flavor.py E325 -lib/ansible/modules/cloud/openstack/os_nova_flavor.py E326 lib/ansible/modules/cloud/openstack/os_nova_host_aggregate.py E324 -lib/ansible/modules/cloud/openstack/os_nova_host_aggregate.py E325 -lib/ansible/modules/cloud/openstack/os_nova_host_aggregate.py E326 -lib/ansible/modules/cloud/openstack/os_object.py E324 -lib/ansible/modules/cloud/openstack/os_object.py E325 -lib/ansible/modules/cloud/openstack/os_object.py E326 lib/ansible/modules/cloud/openstack/os_port.py E324 lib/ansible/modules/cloud/openstack/os_port.py E325 -lib/ansible/modules/cloud/openstack/os_port.py E326 -lib/ansible/modules/cloud/openstack/os_port_facts.py E324 -lib/ansible/modules/cloud/openstack/os_port_facts.py E325 -lib/ansible/modules/cloud/openstack/os_port_facts.py E326 lib/ansible/modules/cloud/openstack/os_project.py E324 lib/ansible/modules/cloud/openstack/os_project.py E325 -lib/ansible/modules/cloud/openstack/os_project.py E326 -lib/ansible/modules/cloud/openstack/os_project_access.py E324 -lib/ansible/modules/cloud/openstack/os_project_access.py E325 -lib/ansible/modules/cloud/openstack/os_project_access.py E326 lib/ansible/modules/cloud/openstack/os_project_facts.py E324 -lib/ansible/modules/cloud/openstack/os_project_facts.py E325 -lib/ansible/modules/cloud/openstack/os_project_facts.py E326 lib/ansible/modules/cloud/openstack/os_quota.py E322 lib/ansible/modules/cloud/openstack/os_quota.py E323 lib/ansible/modules/cloud/openstack/os_quota.py E324 -lib/ansible/modules/cloud/openstack/os_quota.py E325 lib/ansible/modules/cloud/openstack/os_quota.py E326 lib/ansible/modules/cloud/openstack/os_recordset.py E324 -lib/ansible/modules/cloud/openstack/os_recordset.py E325 -lib/ansible/modules/cloud/openstack/os_recordset.py E326 lib/ansible/modules/cloud/openstack/os_router.py E324 lib/ansible/modules/cloud/openstack/os_router.py E325 -lib/ansible/modules/cloud/openstack/os_router.py E326 lib/ansible/modules/cloud/openstack/os_security_group.py E324 -lib/ansible/modules/cloud/openstack/os_security_group.py E325 -lib/ansible/modules/cloud/openstack/os_security_group.py E326 lib/ansible/modules/cloud/openstack/os_security_group_rule.py E324 -lib/ansible/modules/cloud/openstack/os_security_group_rule.py E325 lib/ansible/modules/cloud/openstack/os_security_group_rule.py E326 lib/ansible/modules/cloud/openstack/os_server.py E322 lib/ansible/modules/cloud/openstack/os_server.py E324 lib/ansible/modules/cloud/openstack/os_server.py E325 -lib/ansible/modules/cloud/openstack/os_server.py E326 -lib/ansible/modules/cloud/openstack/os_server_action.py E324 -lib/ansible/modules/cloud/openstack/os_server_action.py E325 -lib/ansible/modules/cloud/openstack/os_server_action.py E326 -lib/ansible/modules/cloud/openstack/os_server_facts.py E324 lib/ansible/modules/cloud/openstack/os_server_facts.py E325 -lib/ansible/modules/cloud/openstack/os_server_facts.py E326 -lib/ansible/modules/cloud/openstack/os_server_group.py E324 -lib/ansible/modules/cloud/openstack/os_server_group.py E325 -lib/ansible/modules/cloud/openstack/os_server_group.py E326 lib/ansible/modules/cloud/openstack/os_server_volume.py E324 -lib/ansible/modules/cloud/openstack/os_server_volume.py E325 -lib/ansible/modules/cloud/openstack/os_server_volume.py E326 lib/ansible/modules/cloud/openstack/os_stack.py E324 lib/ansible/modules/cloud/openstack/os_stack.py E325 -lib/ansible/modules/cloud/openstack/os_stack.py E326 lib/ansible/modules/cloud/openstack/os_subnet.py E324 lib/ansible/modules/cloud/openstack/os_subnet.py E325 lib/ansible/modules/cloud/openstack/os_subnet.py E326 lib/ansible/modules/cloud/openstack/os_subnets_facts.py E322 lib/ansible/modules/cloud/openstack/os_subnets_facts.py E323 -lib/ansible/modules/cloud/openstack/os_subnets_facts.py E324 -lib/ansible/modules/cloud/openstack/os_subnets_facts.py E325 -lib/ansible/modules/cloud/openstack/os_subnets_facts.py E326 lib/ansible/modules/cloud/openstack/os_user.py E324 lib/ansible/modules/cloud/openstack/os_user.py E325 -lib/ansible/modules/cloud/openstack/os_user.py E326 lib/ansible/modules/cloud/openstack/os_user_facts.py E324 -lib/ansible/modules/cloud/openstack/os_user_facts.py E325 -lib/ansible/modules/cloud/openstack/os_user_facts.py E326 -lib/ansible/modules/cloud/openstack/os_user_group.py E324 -lib/ansible/modules/cloud/openstack/os_user_group.py E325 -lib/ansible/modules/cloud/openstack/os_user_group.py E326 -lib/ansible/modules/cloud/openstack/os_user_role.py E324 -lib/ansible/modules/cloud/openstack/os_user_role.py E325 -lib/ansible/modules/cloud/openstack/os_user_role.py E326 lib/ansible/modules/cloud/openstack/os_volume.py E322 lib/ansible/modules/cloud/openstack/os_volume.py E324 -lib/ansible/modules/cloud/openstack/os_volume.py E325 -lib/ansible/modules/cloud/openstack/os_volume.py E326 lib/ansible/modules/cloud/openstack/os_zone.py E324 -lib/ansible/modules/cloud/openstack/os_zone.py E325 lib/ansible/modules/cloud/openstack/os_zone.py E326 lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py E324 lib/ansible/modules/cloud/ovirt/ovirt_affinity_group.py E325