Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
salt-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
salt-formula
Commits
73906a03
Unverified
Commit
73906a03
authored
8 years ago
by
Tobias Martin
Browse files
Options
Downloads
Patches
Plain Diff
added beacons configuration support
parent
f58562be
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
pillar.example
+15
-1
15 additions, 1 deletion
pillar.example
salt/files/minion.d/beacons.conf
+9
-0
9 additions, 0 deletions
salt/files/minion.d/beacons.conf
salt/files/minion.d/f_defaults.conf
+1
-1
1 addition, 1 deletion
salt/files/minion.d/f_defaults.conf
with
25 additions
and
2 deletions
pillar.example
+
15
−
1
View file @
73906a03
...
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
salt/files/minion.d/beacons.conf
0 → 100644
+
9
−
0
View file @
73906a03
#
# 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
-%}
This diff is collapsed.
Click to expand it.
salt/files/minion.d/f_defaults.conf
+
1
−
1
View file @
73906a03
# 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
= [] -%}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment