From 4c03ae0c1663d0ab6eea493de2f1a5c653cacfdc Mon Sep 17 00:00:00 2001
From: Valery Tschopp <valery.tschopp@switch.ch>
Date: Mon, 20 Jan 2020 16:30:21 +0100
Subject: [PATCH] Fix os_user_role issue to grant a role in a domain

Set domain_id when domain is set or project/domain is set.

Change-Id: I0f189647cd9b97252f29055506f75dfd8398dee4
Task: 38309
Story: 2007184
---
 plugins/modules/os_user_role.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/modules/os_user_role.py b/plugins/modules/os_user_role.py
index 632c5424..f848a83d 100644
--- a/plugins/modules/os_user_role.py
+++ b/plugins/modules/os_user_role.py
@@ -133,6 +133,7 @@ def main():
     sdk, cloud = openstack_cloud_from_module(module)
     try:
         filters = {}
+        domain_id = None
 
         r = cloud.get_role(role)
         if r is None:
@@ -144,6 +145,7 @@ def main():
             if d is None:
                 module.fail_json(msg="Domain %s is not valid" % domain)
             filters['domain'] = d['id']
+            domain_id = d['id']
         if user:
             if domain:
                 u = cloud.get_user(user, domain_id=filters['domain'])
@@ -158,7 +160,6 @@ def main():
             if g is None:
                 module.fail_json(msg="Group %s is not valid" % group)
             filters['group'] = g['id']
-        domain_id = None
         if project:
             if domain:
                 p = cloud.get_project(project, domain_id=filters['domain'])