Remove auth_token parameter

It turns out that this can actually already be handled by the existing
auth plugin framework and does not need its own parameter. Remove before
it sees usage and causes confusion.
This commit is contained in:
Monty Taylor 2015-02-13 10:40:50 -05:00
parent 0912781357
commit 4e4bdaad8d

View file

@ -75,7 +75,6 @@ def openstack_full_argument_spec(**kwargs):
cloud=dict(default=None), cloud=dict(default=None),
auth_plugin=dict(default=None), auth_plugin=dict(default=None),
auth=dict(default=None), auth=dict(default=None),
auth_token=dict(default=None),
region_name=dict(default=None), region_name=dict(default=None),
availability_zone=dict(default=None), availability_zone=dict(default=None),
state=dict(default='present', choices=['absent', 'present']), state=dict(default='present', choices=['absent', 'present']),
@ -94,10 +93,6 @@ def openstack_module_kwargs(**kwargs):
required_one_of=[ required_one_of=[
['cloud', 'auth'], ['cloud', 'auth'],
], ],
mutually_exclusive=[
['auth', 'auth_token'],
['auth_plugin', 'auth_token'],
],
) )
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: