saltstack-formulas/keepalived-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from kpostrup/master

Browse Source 
Fixed incorrect reference to pillar keepalived.defaults scope.
This commit is contained in:
Forrest 2015-12-01 11:44:50 -08:00
commit 20b5384884
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keepalived/templates/keepalived.jinja
View File

@ -17,10 +17,10 @@ global_defs {
{%- endfor %}
{%- endif %}
}
notification_email_from {{ salt['pillar.get']('keepalived:defaults:notification_email_from', 'keepalived@'~salt['grains.get']('fqdn') ) }}
smtp_server {{ salt['pillar.get']('keepalived:defaults:smtp_server', 'localhost') }}
notification_email_from {{ salt['pillar.get']('keepalived:global_defs:notification_email_from', 'keepalived@'~salt['grains.get']('fqdn') ) }}
smtp_server {{ salt['pillar.get']('keepalived:global_defs:smtp_server', 'localhost') }}
{%- if 'smtp_timeout' in salt['pillar.get']('keepalived:global_defs') %}
smtp_timeout {{ salt['pillar.get']('keepalived:defaults:smtp_timeout') }}
smtp_timeout {{ salt['pillar.get']('keepalived:global_defs:smtp_timeout') }}
{%- endif %}
}