From 0404d8a8b9471df08929dbb42f7f9f31b0b7e65d Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Sun, 23 Oct 2016 19:29:26 -0400 Subject: [PATCH] Corrected the defaults. --- keepalived/defaults.yaml | 5 ++--- keepalived/templates/keepalived.jinja | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keepalived/defaults.yaml b/keepalived/defaults.yaml index 65a9acd..4e477bd 100644 --- a/keepalived/defaults.yaml +++ b/keepalived/defaults.yaml @@ -1,6 +1,5 @@ --- # keepalived/defaults.yaml -keepalived: - global_defs: - smtp_server: localhost +global_defs: + smtp_server: localhost diff --git a/keepalived/templates/keepalived.jinja b/keepalived/templates/keepalived.jinja index 899aff7..20b95d6 100644 --- a/keepalived/templates/keepalived.jinja +++ b/keepalived/templates/keepalived.jinja @@ -7,7 +7,7 @@ {{ '\n' }} {%- import_yaml 'keepalived/defaults.yaml' as keepalived_defaults %} {%- set keepalived_final_values = salt.pillar.get( - 'keepalived:', + 'keepalived', default=keepalived_defaults, merge=True) %}