cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Keystone_user module: fix authentication needs tenant_name too

Browse source 
The keystone client needs to be passed tenant_name when authenticating the
user/password way. Also it needs auth_url instead of endpoint.
This fix adds login_tenant_name as a module parameter which is consistent
with the other OpenStack modules.
This commit is contained in:
Darragh O'Reilly 2013-07-10 07:21:07 +01:00
parent 714cb02f5b
commit 6346798e7e
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
library/cloud/keystone_user
View file

@ -20,6 +20,11 @@ options:
- Password of login user - Password of login user
required: false required: false
default: 'yes' default: 'yes'
login_tenant_name:
description:
- The tenant login_user belongs to
required: false
default: None
token: token:
description: description:
- The token to be uses in case the password is not specified - The token to be uses in case the password is not specified
@ -88,14 +93,14 @@ else:
keystoneclient_found = True keystoneclient_found = True
def authenticate(endpoint, token, login_user, login_password): def authenticate(endpoint, token, login_user, login_password, login_tenant_name):
"""Return a keystone client object""" """Return a keystone client object"""
if token: if token:
return client.Client(endpoint=endpoint, token=token) return client.Client(endpoint=endpoint, token=token)
else: else:
return client.Client(endpoint=endpoint, username=login_user, return client.Client(auth_url=endpoint, username=login_user,
password=login_password) password=login_password, tenant_name=login_tenant_name)
def tenant_exists(keystone, tenant): def tenant_exists(keystone, tenant):
@ -293,11 +298,13 @@ def main():
default="http://127.0.0.1:35357/v2.0"), default="http://127.0.0.1:35357/v2.0"),
token=dict(required=False), token=dict(required=False),
login_user=dict(required=False), login_user=dict(required=False),
login_password=dict(required=False) login_password=dict(required=False),
login_tenant_name=dict(required=False)
), ),
supports_check_mode=True, supports_check_mode=True,
mutually_exclusive=[['token', 'login_user'], mutually_exclusive=[['token', 'login_user'],
['token', 'login_password']] ['token', 'login_password'],
['token', 'login_tenant_name']]
) )
if not keystoneclient_found: if not keystoneclient_found:
@ -314,8 +321,9 @@ def main():
token = module.params['token'] token = module.params['token']
login_user = module.params['login_user'] login_user = module.params['login_user']
login_password = module.params['login_password'] login_password = module.params['login_password']
login_tenant_name = module.params['login_tenant_name']
keystone = authenticate(endpoint, token, login_user, login_password) keystone = authenticate(endpoint, token, login_user, login_password, login_tenant_name)
check_mode = module.check_mode check_mode = module.check_mode