From 3f85ced5254a7b6823d7be0f4aeb75488bb14150 Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Thu, 19 Jan 2017 09:06:48 -0500 Subject: [PATCH] Replaced the old macro. --- keepalived/templates/keepalived.jinja | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/keepalived/templates/keepalived.jinja b/keepalived/templates/keepalived.jinja index 3aaf5e1..44f61cd 100644 --- a/keepalived/templates/keepalived.jinja +++ b/keepalived/templates/keepalived.jinja @@ -6,6 +6,9 @@ # Any changes will be overwritten. {{ '\n' }} +{% import 'config.jinja' as config %} +{{ config.keepalived_config(keepalived_final_values) }} + {# Macro Explanation: @@ -19,7 +22,7 @@ hash is then processed by calling the macro again. Forced carriage returns and use of jinja's indent are only there to make the final file more human readable. They serve no other function. #} - +{# {%- import_yaml 'keepalived/defaults.yaml' as keepalived_defaults -%} {%- set keepalived_final_values = salt.pillar.get( 'keepalived', @@ -61,3 +64,4 @@ the final file more human readable. They serve no other function. {%- endmacro -%} {{ config_entries(keepalived_final_values, 0) }} +#}