Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport/2.5/36722 #36733

Merged
merged 2 commits into from
Feb 26, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 5 additions & 10 deletions lib/ansible/utils/module_docs_fragments/openstack.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,16 @@ class ModuleDocFragment(object):
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.
required: false
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.
Expand All @@ -68,29 +67,25 @@ class ModuleDocFragment(object):
- 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.
Expand Down