Merge pull request #55336 from max-arnold/utils-in-grains

[master] Allow the __utils__ dunder in Grains modules (port #49128)
saltstack · Jan 2, 2020 · da7b776 · da7b776
2 parents a657ddc + 451287e
commit da7b776
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/salt/loader.py b/salt/loader.py
@@ -674,7 +674,7 @@ def grain_funcs(opts, proxy=None):
           __opts__ = salt.config.minion_config('/etc/salt/minion')
           grainfuncs = salt.loader.grain_funcs(__opts__)
     '''
-    return LazyLoader(
+    ret = LazyLoader(
         _module_dirs(
             opts,
             'grains',
@@ -684,6 +684,8 @@ def grain_funcs(opts, proxy=None):
         opts,
         tag='grains',
     )
+    ret.pack['__utils__'] = utils(opts, proxy=proxy)
+    return ret
 
 
 def _load_cached_grains(opts, cfn):