Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added sanity check: is 'pillar' in self.opts #31391

Merged
merged 1 commit into from Feb 22, 2016
Merged

Added sanity check: is 'pillar' in self.opts #31391

merged 1 commit into from Feb 22, 2016

Conversation

redmcg
Copy link

@redmcg redmcg commented Feb 21, 2016

This fixes an exception that is thrown when using the 'when' clause in a
master scheduler. The master does not appear to create a 'pillar' entry
in self.opts (hence you get an exception when trying to check if 'whens' is in self.opts['pillar']).

For example - the following schedule entry in the master config would create this exception:

schedule:
  test_master_schedule:
    function: myrunner.test
    when: 10:00pm

This fixes an exception that is thrown when using the 'when' clause in a
master scheduler. The master does not appear to create a 'pillar' entry
in self.opts
terminalmage pushed a commit that referenced this pull request Feb 22, 2016
Added sanity check: is 'pillar' in self.opts
@terminalmage terminalmage merged commit ac6af79 into saltstack:2015.8 Feb 22, 2016
@redmcg redmcg deleted the master_schedule_fix branch February 22, 2016 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants