Skip to content

A
ansible
Commit 79527235 by Rene Moser
Options

cloudstack: fix domain name is not unique, use full path

parent b9b1e294
Showing with 6 additions and 4 deletions
lib/ansible/module_utils/cloudstack.py
...@@ -274,11 +274,12 @@ class AnsibleCloudStack: ...@@ -274,11 +274,12 @@ class AnsibleCloudStack:
return None return None
args = {} args = {}
args['name'] = domain
args['listall'] = True args['listall'] = True
domains = self.cs.listDomains(**args) domains = self.cs.listDomains(**args)
if domains: if domains:
self.domain = domains['domain'][0] for d in domains['domain']:
if d['path'].lower() in [ domain.lower(), "root/" + domain.lower(), "root" + domain.lower() ]:
self.domain = d
return self._get_by_key(key, self.domain) return self._get_by_key(key, self.domain)
self.module.fail_json(msg="Domain '%s' not found" % domain) self.module.fail_json(msg="Domain '%s' not found" % domain)
......
v1/ansible/module_utils/cloudstack.py
...@@ -274,11 +274,12 @@ class AnsibleCloudStack: ...@@ -274,11 +274,12 @@ class AnsibleCloudStack:
return None return None
args = {} args = {}
args['name'] = domain
args['listall'] = True args['listall'] = True
domains = self.cs.listDomains(**args) domains = self.cs.listDomains(**args)
if domains: if domains:
self.domain = domains['domain'][0] for d in domains['domain']:
if d['path'].lower() in [ domain.lower(), "root/" + domain.lower(), "root" + domain.lower() ]:
self.domain = d
return self._get_by_key(key, self.domain) return self._get_by_key(key, self.domain)
self.module.fail_json(msg="Domain '%s' not found" % domain) self.module.fail_json(msg="Domain '%s' not found" % domain)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment