this supports complex grain types

This commit is contained in:
Mike Zupan 2015-01-31 02:45:09 -08:00
parent a1049565eb
commit 0d875bf94b

View File

@ -437,8 +437,7 @@ def filter_by(lookup_dict, grain='os_family', merge=None, default='default', bas
'''
ret = lookup_dict.get(
__grains__.get(
grain, default),
salt.utils.traverse_dict_and_list(__grains__, grain, None),
lookup_dict.get(
default, None)
)