From c7506b5b1075800d6b985729eaa340908a9d9189 Mon Sep 17 00:00:00 2001 From: Bram Verschueren Date: Thu, 23 Jan 2020 08:22:46 +0100 Subject: [PATCH] fix os_user_role for groups in multidomain context This fixes searching for a group in multi-domain context by passing the domain_id in the call to get_groups. original github PR: https://github.com/ansible/ansible/pull/62858 Change-Id: Ia2216728c15cc9d9a5e29bfe6b9fc63d2c6982ce Task: 38375 Story: 2007209 --- plugins/modules/os_user_role.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/modules/os_user_role.py b/plugins/modules/os_user_role.py index f848a83d..916bd912 100644 --- a/plugins/modules/os_user_role.py +++ b/plugins/modules/os_user_role.py @@ -156,7 +156,10 @@ def main(): module.fail_json(msg="User %s is not valid" % user) filters['user'] = u['id'] if group: - g = cloud.get_group(group) + if domain: + g = cloud.get_group(group, domain_id=filters['domain']) + else: + g = cloud.get_group(group) if g is None: module.fail_json(msg="Group %s is not valid" % group) filters['group'] = g['id']