From 4e4bdaad8d500c1c8168a8606e7284a65685367a Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 13 Feb 2015 10:40:50 -0500 Subject: [PATCH] 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. --- lib/ansible/module_utils/openstack.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/ansible/module_utils/openstack.py b/lib/ansible/module_utils/openstack.py index 5c4503f94ce..90415cadabb 100644 --- a/lib/ansible/module_utils/openstack.py +++ b/lib/ansible/module_utils/openstack.py @@ -75,7 +75,6 @@ def openstack_full_argument_spec(**kwargs): cloud=dict(default=None), auth_plugin=dict(default=None), auth=dict(default=None), - auth_token=dict(default=None), region_name=dict(default=None), availability_zone=dict(default=None), state=dict(default='present', choices=['absent', 'present']), @@ -94,10 +93,6 @@ def openstack_module_kwargs(**kwargs): required_one_of=[ ['cloud', 'auth'], ], - mutually_exclusive=[ - ['auth', 'auth_token'], - ['auth_plugin', 'auth_token'], - ], ) for key in ('mutually_exclusive', 'required_together', 'required_one_of'): if key in kwargs: