mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-23 05:10:22 -07:00
Update common OpenStack requests-related parameters
Also, update docs related to earlier changes in this stack.
This commit is contained in:
parent
8027a8a0b5
commit
8758ba08bd
3 changed files with 32 additions and 10 deletions
|
@ -77,10 +77,14 @@ def openstack_full_argument_spec(**kwargs):
|
||||||
auth=dict(default=None),
|
auth=dict(default=None),
|
||||||
region_name=dict(default=None),
|
region_name=dict(default=None),
|
||||||
availability_zone=dict(default=None),
|
availability_zone=dict(default=None),
|
||||||
|
verify=dict(default=True),
|
||||||
|
cacert=dict(default=None),
|
||||||
|
cert=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'),
|
||||||
endpoint_type=dict(
|
endpoint_type=dict(
|
||||||
default='publicURL', choices=['publicURL', 'internalURL']
|
default='public', choices=['public', 'internal', 'admin']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
spec.update(kwargs)
|
spec.update(kwargs)
|
||||||
|
|
|
@ -34,17 +34,13 @@ options:
|
||||||
this param will need to contain whatever parameters that auth plugin
|
this param will need to contain whatever parameters that auth plugin
|
||||||
requires. This parameter is not needed if a named cloud is provided.
|
requires. This parameter is not needed if a named cloud is provided.
|
||||||
required: false
|
required: false
|
||||||
auth_plugin:
|
auth_type:
|
||||||
description:
|
description:
|
||||||
- Name of the auth plugin to use. If the cloud uses something other than
|
- Name of the auth plugin to use. If the cloud uses something other than
|
||||||
password authentication, the name of the plugin should be indicated here
|
password authentication, the name of the plugin should be indicated here
|
||||||
and the contents of the I(auth) parameter should be updated accordingly.
|
and the contents of the I(auth) parameter should be updated accordingly.
|
||||||
required: false
|
required: false
|
||||||
default: password
|
default: password
|
||||||
auth_token:
|
|
||||||
description:
|
|
||||||
- An auth token obtained previously. If I(auth_token) is given,
|
|
||||||
I(auth) and I(auth_plugin) are not needed.
|
|
||||||
region_name:
|
region_name:
|
||||||
description:
|
description:
|
||||||
- Name of the region.
|
- Name of the region.
|
||||||
|
@ -64,12 +60,30 @@ 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
|
||||||
|
verify:
|
||||||
|
description:
|
||||||
|
- Whether or not SSL API requests should be verified.
|
||||||
|
required: false
|
||||||
|
default: True
|
||||||
|
cacert:
|
||||||
|
description:
|
||||||
|
- A path to a CA Cert bundle that can be used as part of verifying
|
||||||
|
SSL API requests.
|
||||||
|
required: false
|
||||||
|
cert:
|
||||||
|
description:
|
||||||
|
- A path to a client certificate to use as part of the SSL transaction
|
||||||
|
required: false
|
||||||
|
key:
|
||||||
|
description:
|
||||||
|
- A path to a client key to use as part of the SSL transaction
|
||||||
|
required: false
|
||||||
endpoint_type:
|
endpoint_type:
|
||||||
description:
|
description:
|
||||||
- Endpoint URL type to fetch from the service catalog.
|
- Endpoint URL type to fetch from the service catalog.
|
||||||
choices: [publicURL, internalURL]
|
choices: [public, internal, admin]
|
||||||
required: false
|
required: false
|
||||||
default: publicURL
|
default: public
|
||||||
requirements:
|
requirements:
|
||||||
- shade
|
- shade
|
||||||
notes:
|
notes:
|
||||||
|
|
|
@ -73,14 +73,18 @@ def openstack_find_nova_addresses(addresses, ext_tag, key_name=None):
|
||||||
def openstack_full_argument_spec(**kwargs):
|
def openstack_full_argument_spec(**kwargs):
|
||||||
spec = dict(
|
spec = dict(
|
||||||
cloud=dict(default=None),
|
cloud=dict(default=None),
|
||||||
auth_plugin=dict(default=None),
|
auth_type=dict(default=None),
|
||||||
auth=dict(default=None),
|
auth=dict(default=None),
|
||||||
region_name=dict(default=None),
|
region_name=dict(default=None),
|
||||||
availability_zone=dict(default=None),
|
availability_zone=dict(default=None),
|
||||||
|
verify=dict(default=True),
|
||||||
|
cacert=dict(default=None),
|
||||||
|
cert=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'),
|
||||||
endpoint_type=dict(
|
endpoint_type=dict(
|
||||||
default='publicURL', choices=['publicURL', 'internalURL']
|
default='public', choices=['public', 'internal', 'admin']
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
spec.update(kwargs)
|
spec.update(kwargs)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue