summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Coca <bcoca@ansible.com>2015-08-22 12:39:42 -0400
committerBrian Coca <bcoca@ansible.com>2015-08-22 12:39:42 -0400
commit47d9e7ca93808383568c3019ac32de7e7ba05ac5 (patch)
treecc5e37fa0e97bf57b93b6a12c24056cf9b265d26
parent0958edfc7c7b665f203ffa719ccf6e6f073bdef4 (diff)
parent77b60a1a67d1c0defe146f718ac7ccbf303a8205 (diff)
downloadansible-47d9e7ca93808383568c3019ac32de7e7ba05ac5.tar.gz
Merge pull request #11984 from Alphadelta14/devel
Support any Mapping for with_dict lookup.
-rw-r--r--lib/ansible/plugins/lookup/dict.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ansible/plugins/lookup/dict.py b/lib/ansible/plugins/lookup/dict.py
index 1b54f3db93..e9c2596b23 100644
--- a/lib/ansible/plugins/lookup/dict.py
+++ b/lib/ansible/plugins/lookup/dict.py
@@ -17,6 +17,8 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
+import collections
+
from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
@@ -24,7 +26,8 @@ class LookupModule(LookupBase):
def run(self, terms, varibles=None, **kwargs):
- if not isinstance(terms, dict):
+ # Expect any type of Mapping, notably hostvars
+ if not isinstance(terms, collections.Mapping):
raise AnsibleError("with_dict expects a dict")
return self._flatten_hash_to_list(terms)