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

Enable option to set minion scheduler #323

Merged
merged 1 commit into from
Jul 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ salt:
mine_functions:
network.interface_ip: [eth0]

# Define a minion scheduler
schedule:
- highstate:
- function: state.apply
- minutes: 60
- returner: redis

# other 'non-default' config
auth_keytab: /root/auth.keytab
auth_principal: kadmin/admin
Expand Down
21 changes: 21 additions & 0 deletions salt/files/minion.d/f_defaults.conf
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,27 @@ mine_functions:
# second on the minion scheduler.
{{ get_config('loop_interval', '1') }}


# When using the scheduler at least one schedule needs to be
# defined. The user running the salt master will need read access to the repo.
{% if 'schedule' in cfg_minion -%}
{%- do default_keys.append('schedule') %}
schedule:
{%- for schedule in cfg_minion['schedule'] %}
{%- if schedule is iterable and schedule is not string %}
{%- for name, children in schedule.items() %}
{{ name }}:
{%- for child in children %}
{%- for key, value in child.items() %}
{{ key }}: {{ value }}
{%- endfor -%}
{%- endfor -%}
{%- endfor -%}
{%- endif -%}
{%- endfor -%}
{%- endif %}


# Some installations choose to start all job returns in a cache or a returner
# and forgo sending the results back to a master. In this workflow, jobs
# are most often executed with --async from the Salt CLI and then results
Expand Down