From 90ca3865551b57482e1235d46f66449049e6f6c6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 31 Mar 2015 20:29:06 -0400 Subject: [PATCH] Add api timeout now that shade spports it everywhere --- lib/ansible/module_utils/openstack.py | 1 + lib/ansible/utils/module_docs_fragments/openstack.py | 5 +++++ v2/ansible/module_utils/openstack.py | 1 + 3 files changed, 7 insertions(+) diff --git a/lib/ansible/module_utils/openstack.py b/lib/ansible/module_utils/openstack.py index 35b9026213..9e4824a301 100644 --- a/lib/ansible/module_utils/openstack.py +++ b/lib/ansible/module_utils/openstack.py @@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs): key=dict(default=None), wait=dict(default=True, type='bool'), timeout=dict(default=180, type='int'), + api_timeout=dict(default=None, type='int'), endpoint_type=dict( default='public', choices=['public', 'internal', 'admin'] ) diff --git a/lib/ansible/utils/module_docs_fragments/openstack.py b/lib/ansible/utils/module_docs_fragments/openstack.py index 2979cb68d7..5643b4e6ac 100644 --- a/lib/ansible/utils/module_docs_fragments/openstack.py +++ b/lib/ansible/utils/module_docs_fragments/openstack.py @@ -60,6 +60,11 @@ options: - How long should ansible wait for the requested resource. required: false default: 180 + api_timeout: + description: + - 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: description: - Whether or not SSL API requests should be verified. diff --git a/v2/ansible/module_utils/openstack.py b/v2/ansible/module_utils/openstack.py index 35b9026213..9e4824a301 100644 --- a/v2/ansible/module_utils/openstack.py +++ b/v2/ansible/module_utils/openstack.py @@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs): key=dict(default=None), wait=dict(default=True, type='bool'), timeout=dict(default=180, type='int'), + api_timeout=dict(default=None, type='int'), endpoint_type=dict( default='public', choices=['public', 'internal', 'admin'] )