valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't merge ext_nodes with pillar lookup, fix #1816

Browse Source
This commit is contained in:
Thomas S Hatch 2012-08-13 16:28:41 -06:00
parent 34eaf1f26c
commit 937bd5b67d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/pillar/__init__.py
View File

@ -242,12 +242,6 @@ class Pillar(object):
for item in data:
if isinstance(item, string_types):
matches[env].append(item)
ext_matches = self.client.ext_nodes()
for env in ext_matches:
if env in matches:
matches[env] = list(set(ext_matches[env]).union(matches[env]))
else:
matches[env] = ext_matches[env]
return matches
def render_pstate(self, sls, env, mods):