From 87c99b46758dcdca3ccb2daed72a85b7175036a8 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 1 Apr 2015 07:54:02 -0400 Subject: [PATCH] Align verify parameter with validate_certs The rest of ansible uses validate_certs, so make that the main documented parameter. However, leave verify as an alias since that's the passthrough value to the underlying libraries. --- lib/ansible/module_utils/openstack.py | 2 +- lib/ansible/utils/module_docs_fragments/openstack.py | 4 +++- v2/ansible/module_utils/openstack.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ansible/module_utils/openstack.py b/lib/ansible/module_utils/openstack.py index 9e4824a301d..b58cc534287 100644 --- a/lib/ansible/module_utils/openstack.py +++ b/lib/ansible/module_utils/openstack.py @@ -77,7 +77,7 @@ def openstack_full_argument_spec(**kwargs): auth=dict(default=None), region_name=dict(default=None), availability_zone=dict(default=None), - verify=dict(default=True), + verify=dict(default=True, aliases=['validate_certs']), cacert=dict(default=None), cert=dict(default=None), key=dict(default=None), diff --git a/lib/ansible/utils/module_docs_fragments/openstack.py b/lib/ansible/utils/module_docs_fragments/openstack.py index 5643b4e6acc..519ad785b9b 100644 --- a/lib/ansible/utils/module_docs_fragments/openstack.py +++ b/lib/ansible/utils/module_docs_fragments/openstack.py @@ -65,11 +65,13 @@ 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 - verify: + default: None + validate_certs: description: - Whether or not SSL API requests should be verified. required: false default: True + aliases: ['verify'] cacert: description: - A path to a CA Cert bundle that can be used as part of verifying diff --git a/v2/ansible/module_utils/openstack.py b/v2/ansible/module_utils/openstack.py index 9e4824a301d..b58cc534287 100644 --- a/v2/ansible/module_utils/openstack.py +++ b/v2/ansible/module_utils/openstack.py @@ -77,7 +77,7 @@ def openstack_full_argument_spec(**kwargs): auth=dict(default=None), region_name=dict(default=None), availability_zone=dict(default=None), - verify=dict(default=True), + verify=dict(default=True, aliases=['validate_certs']), cacert=dict(default=None), cert=dict(default=None), key=dict(default=None),