ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 06:10:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #10977 from emonty/fix-envvars

Browse source 
Fix envvars support in openstack modules
This commit is contained in:
Toshio Kuratomi 2015-05-29 13:05:03 -07:00
commit 2924c90a5d
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/openstack.py
View file

@ -93,11 +93,7 @@ def openstack_full_argument_spec(**kwargs):
def openstack_module_kwargs(**kwargs): def openstack_module_kwargs(**kwargs):
ret = dict( ret = {}
required_one_of=[
['cloud', 'auth'],
],
)
for key in ('mutually_exclusive', 'required_together', 'required_one_of'): for key in ('mutually_exclusive', 'required_together', 'required_one_of'):
if key in kwargs: if key in kwargs:
if key in ret: if key in ret:

13
lib/ansible/utils/module_docs_fragments/openstack.py
View file

@ -23,7 +23,9 @@ class ModuleDocFragment(object):
options: options:
cloud: cloud:
description: description:
- Named cloud to operate against. Provides default values for I(auth) and I(auth_plugin) - Named cloud to operate against. Provides default values for I(auth) and
I(auth_type). This parameter is not needed if I(auth) is provided or if
OpenStack OS_* environment variables are present.
required: false required: false
auth: auth:
description: description:
@ -32,7 +34,8 @@ options:
I(auth_url), I(username), I(password), I(project_name) and any I(auth_url), I(username), I(password), I(project_name) and any
information about domains if the cloud supports them. For other plugins, information about domains if the cloud supports them. For other plugins,
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 or
OpenStack OS_* environment variables are present.
required: false required: false
auth_type: auth_type:
description: description:
@ -77,14 +80,17 @@ options:
- A path to a CA Cert bundle that can be used as part of verifying - A path to a CA Cert bundle that can be used as part of verifying
SSL API requests. SSL API requests.
required: false required: false
default: None
cert: cert:
description: description:
- A path to a client certificate to use as part of the SSL transaction - A path to a client certificate to use as part of the SSL transaction
required: false required: false
default: None
key: key:
description: description:
- A path to a client key to use as part of the SSL transaction - A path to a client key to use as part of the SSL transaction
required: false required: false
default: None
endpoint_type: endpoint_type:
description: description:
- Endpoint URL type to fetch from the service catalog. - Endpoint URL type to fetch from the service catalog.
@ -100,5 +106,6 @@ notes:
can come from a yaml config file in /etc/ansible/openstack.yaml, can come from a yaml config file in /etc/ansible/openstack.yaml,
/etc/openstack/clouds.yaml or ~/.config/openstack/clouds.yaml, then from /etc/openstack/clouds.yaml or ~/.config/openstack/clouds.yaml, then from
standard environment variables, then finally by explicit parameters in standard environment variables, then finally by explicit parameters in
plays. plays. More information can be found at
U(http://docs.openstack.org/developer/os-client-config)
''' '''

6
v2/ansible/module_utils/openstack.py
View file

@ -93,11 +93,7 @@ def openstack_full_argument_spec(**kwargs):
def openstack_module_kwargs(**kwargs): def openstack_module_kwargs(**kwargs):
ret = dict( ret = {}
required_one_of=[
['cloud', 'auth'],
],
)
for key in ('mutually_exclusive', 'required_together', 'required_one_of'): for key in ('mutually_exclusive', 'required_together', 'required_one_of'):
if key in kwargs: if key in kwargs:
if key in ret: if key in ret: