Merge pull request #7 from frots/patch-4

Update keepalived.jinja
This commit is contained in:
Forrest 2015-10-15 12:36:50 -07:00
commit e73d9354b0

View File

@ -17,7 +17,7 @@ global_defs {
{%- endfor %} {%- endfor %}
{%- endif %} {%- endif %}
} }
notificaiton_email_from {{ salt['pillar.get']('keepalived:defaults:notification_email_from', 'keepalived@'~salt['grains.get']('fqdn') ) }} 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') }} smtp_server {{ salt['pillar.get']('keepalived:defaults:smtp_server', 'localhost') }}
{%- if 'smtp_timeout' in salt['pillar.get']('keepalived:global_defs') %} {%- 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:defaults:smtp_timeout') }}