From d4ae38f82592cefe8f6933702a4ccaaa38c60875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Wed, 24 Dec 2014 16:19:43 +0100 Subject: [PATCH] Import the salt/formulas.jinja template with context This is only needed for salt versions older than 2014.7 that do not define the global "salt" variable in such context. --- salt/files/master.d/_defaults.conf | 2 +- salt/files/minion.d/_defaults.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf index 4f1ca52..07763df 100644 --- a/salt/files/master.d/_defaults.conf +++ b/salt/files/master.d/_defaults.conf @@ -12,7 +12,7 @@ #{{ configname }}: {{ default_value }} {%- endif -%} {%- endmacro -%} -{%- from 'salt/formulas.jinja' import file_roots, formulas -%} +{%- from 'salt/formulas.jinja' import file_roots, formulas with context -%} ##### Primary configuration settings ##### ########################################## # This configuration file is used to manage the behavior of the Salt Master diff --git a/salt/files/minion.d/_defaults.conf b/salt/files/minion.d/_defaults.conf index 02de7ac..38a7068 100644 --- a/salt/files/minion.d/_defaults.conf +++ b/salt/files/minion.d/_defaults.conf @@ -12,7 +12,7 @@ #{{ configname }}: {{ default_value }} {%- endif -%} {%- endmacro -%} -{%- from 'salt/formulas.jinja' import file_roots, formulas -%} +{%- from 'salt/formulas.jinja' import file_roots, formulas with context -%} ##### Primary configuration settings ##### ##########################################