Merge pull request #8 from kpostrup/master

Fixed incorrect reference to pillar keepalived.defaults scope.
This commit is contained in:
Forrest 2015-12-01 11:44:50 -08:00
commit 20b5384884

View File

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