Skip to content
This repository has been archived by the owner. It is now read-only.

Commit

Permalink
Merge pull request #30 from basepi/fixup
Browse files Browse the repository at this point in the history
Make sure grains and pillar get loaded in older versions of salt
  • Loading branch information
basepi authored Sep 6, 2016
2 parents ae37579 + cc26c95 commit 00a66ac
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions _beacons/pulsar.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 00a66ac

Please sign in to comment.