Merge pull request #31 from HubbleStack/develop

Merge to master (prep for v2016.9.2)
hubblestack · Sep 6, 2016 · e6b2813 · e6b2813
2 parents 9e162bf + 00a66ac
commit e6b2813
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/_beacons/pulsar.py b/_beacons/pulsar.py
@@ -317,6 +317,8 @@ def beacon(config):
         ret = []
 
     if ret and 'return' in config:
+        __opts__['grains'] = __grains__
+        __opts__['pillar'] = __pillar__
         __returners__ = salt.loader.returners(__opts__, __salt__)
         return_config = config['return']
         if isinstance(return_config, salt.ext.six.string_types):