浏览代码

added beacons configuration support

master
Tobias Martin 7 年前
父节点
当前提交
73906a03a5
没有帐户链接到提交者的电子邮件
共有 3 个文件被更改,包括 25 次插入2 次删除
  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 查看文件

@@ -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:

+ 9
- 0
salt/files/minion.d/beacons.conf 查看文件

@@ -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 -%}

+ 1
- 1
salt/files/minion.d/f_defaults.conf 查看文件

@@ -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 = [] -%}

正在加载...
取消
保存