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

Merge pull request #2 from neilinger/master

Browse Source 
template fix and whitespace cleanup
This commit is contained in:
Forrest 2015-09-16 10:36:29 -07:00
commit 6e64d497a8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keepalived/templates/keepalived.jinja
View File

@ -10,7 +10,7 @@
# Global settings # Global settings
#--------------------------------------------------------------------- #---------------------------------------------------------------------
global_defs { global_defs {
notification_email { notification_email {
{%- if 'notification_emails' in salt['pillar.get']('keepalived:global_defs') %} {%- if 'notification_emails' in salt['pillar.get']('keepalived:global_defs') %}
{%- for email in salt['pillar.get']('keepalived:global_defs:notification_emails', {}).iteritems() %} {%- for email in salt['pillar.get']('keepalived:global_defs:notification_emails', {}).iteritems() %}
{{ email }} {{ email }}
@ -22,6 +22,7 @@ global_defs {
{%- 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') }}
{%- endif %} {%- endif %}
}
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# static network configuration # static network configuration
@ -35,7 +36,7 @@ static_ipaddress {
} }
{%- endif %} {%- endif %}
# static routes # static routes
{%- if 'static_routes' in salt['pillar.get']('keepalived') %} {%- if 'static_routes' in salt['pillar.get']('keepalived') %}
static_route { static_route {
{%- for route in salt['pillar.get']('keepalived:static_routes', {}).iteritems() %} {%- for route in salt['pillar.get']('keepalived:static_routes', {}).iteritems() %}