Browse Source

Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd

tags/v0.57.0
Matthew X. Economou 8 years ago
parent
commit
c43657487f
No account linked to committer's email address
3 changed files with 25 additions and 2 deletions
  1. +15
    -1
      pillar.example
  2. +9
    -0
      salt/files/minion.d/beacons.conf
  3. +1
    -1
      salt/files/minion.d/f_defaults.conf

+ 15
- 1
pillar.example View File

auth_keytab: /root/auth.keytab auth_keytab: /root/auth.keytab
auth_principal: kadmin/admin auth_principal: kadmin/admin


# optional engine configuration
# optional engine configuration
engines: engines:
slack: slack:
token: xoxp-XXXXX-XXXXXXX token: xoxp-XXXXX-XXXXXXX
type: runner type: runner
cmd: jobs.list_jobs 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 # salt cloud config
cloud: cloud:

+ 9
- 0
salt/files/minion.d/beacons.conf View File

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

+ 1
- 1
salt/files/minion.d/f_defaults.conf View File

# This file managed by Salt, do not edit by hand!! # This file managed by Salt, do not edit by hand!!
# Based on salt version 2015.8.7 default config # 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_salt = pillar.get('salt', {}) -%}
{% set cfg_minion = cfg_salt.get('minion', {}) -%} {% set cfg_minion = cfg_salt.get('minion', {}) -%}
{% set default_keys = [] -%} {% set default_keys = [] -%}

Loading…
Cancel
Save