Commit 90ca3865 by Monty Taylor

Add api timeout now that shade spports it everywhere

parent 8758ba08
...@@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs): ...@@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs):
key=dict(default=None), key=dict(default=None),
wait=dict(default=True, type='bool'), wait=dict(default=True, type='bool'),
timeout=dict(default=180, type='int'), timeout=dict(default=180, type='int'),
api_timeout=dict(default=None, type='int'),
endpoint_type=dict( endpoint_type=dict(
default='public', choices=['public', 'internal', 'admin'] default='public', choices=['public', 'internal', 'admin']
) )
......
...@@ -60,6 +60,11 @@ options: ...@@ -60,6 +60,11 @@ options:
- How long should ansible wait for the requested resource. - How long should ansible wait for the requested resource.
required: false required: false
default: 180 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: verify:
description: description:
- Whether or not SSL API requests should be verified. - Whether or not SSL API requests should be verified.
......
...@@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs): ...@@ -83,6 +83,7 @@ def openstack_full_argument_spec(**kwargs):
key=dict(default=None), key=dict(default=None),
wait=dict(default=True, type='bool'), wait=dict(default=True, type='bool'),
timeout=dict(default=180, type='int'), timeout=dict(default=180, type='int'),
api_timeout=dict(default=None, type='int'),
endpoint_type=dict( endpoint_type=dict(
default='public', choices=['public', 'internal', 'admin'] default='public', choices=['public', 'internal', 'admin']
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment