saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix master scheduler with when param

Browse source
This commit is contained in:
jeanluc 2022-10-11 09:37:38 +02:00 • committed by Megan Wilhite
parent 553ff63a38
commit c7fc0df7fb
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/62858.fixed Normal file
View file

@ -0,0 +1 @@
Fixed master job scheduler using when

4
salt/utils/schedule.py
View file

@ -1064,7 +1064,9 @@ class Schedule:
return return
when_ = self.opts["pillar"]["whens"][i] when_ = self.opts["pillar"]["whens"][i]
elif ( elif (
"whens" in self.opts["grains"] and i in self.opts["grains"]["whens"] "grains" in self.opts
and "whens" in self.opts["grains"]
and i in self.opts["grains"]["whens"]
): ):
if not isinstance(self.opts["grains"]["whens"], dict): if not isinstance(self.opts["grains"]["whens"], dict):
data[ data[