added beacons configuration support

This commit is contained in:
Tobias Martin 2017-01-13 14:22:39 +01:00
parent f58562beeb
commit 73906a03a5
No known key found for this signature in database
GPG Key ID: 944B1153D94EEABF
3 changed files with 25 additions and 2 deletions

View File

@ -141,7 +141,7 @@ salt:
auth_keytab: /root/auth.keytab
auth_principal: kadmin/admin
# optional engine configuration
# optional engine configuration
engines:
slack:
token: xoxp-XXXXX-XXXXXXX
@ -157,6 +157,20 @@ salt:
type: runner
cmd: jobs.list_jobs
# optional beacons configuration
beacons:
load:
1m:
- 0.0
- 2.0
5m:
- 0.0
- 1.5
15m:
- 0.1
- 1.0
interval: 10
# salt cloud config
cloud:

View File

@ -0,0 +1,9 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set beacons = salt['pillar.get']('salt:beacons') -%}
{%- set engines = salt['pillar.get']('salt:minion:beacons', default=engines, merge=True) -%}
{%- if beacons %}
beacons:
{{ beacons | yaml(False) | indent(2) }}
{%- endif -%}

View File

@ -1,7 +1,7 @@
# This file managed by Salt, do not edit by hand!!
# Based on salt version 2015.8.7 default config
#
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines'] -%}
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons'] -%}
{% set cfg_salt = pillar.get('salt', {}) -%}
{% set cfg_minion = cfg_salt.get('minion', {}) -%}
{% set default_keys = [] -%}