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

Make os_user_role respect domain when querying for projects (#2520)

Browse source
This commit is contained in:
Alvaro Aleman 2016-07-21 17:40:57 +02:00 committed by Matt Clay
parent bc8e8173ad
commit 0a9cdf647a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/extras/cloud/openstack/os_user_role.py
View file

@ -165,16 +165,20 @@ def main():
if g is None: if g is None:
module.fail_json(msg="Group %s is not valid" % group) module.fail_json(msg="Group %s is not valid" % group)
filters['group'] = g['id'] filters['group'] = g['id']
if project:
p = cloud.get_project(project)
if p is None:
module.fail_json(msg="Project %s is not valid" % project)
filters['project'] = p['id']
if domain: if domain:
d = cloud.get_domain(domain) d = cloud.get_domain(domain)
if d is None: if d is None:
module.fail_json(msg="Domain %s is not valid" % domain) module.fail_json(msg="Domain %s is not valid" % domain)
filters['domain'] = d['id'] filters['domain'] = d['id']
if project:
if domain:
p = cloud.get_project(project, domain_id=filters['domain'])
else:
p = cloud.get_project(project)
if p is None:
module.fail_json(msg="Project %s is not valid" % project)
filters['project'] = p['id']
assignment = cloud.list_role_assignments(filters=filters) assignment = cloud.list_role_assignments(filters=filters)