From 3f9e4fc7d47bcf0c1f67952b4a6edebe17a04f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Paw=C5=82owski?= Date: Thu, 30 Jul 2015 10:45:20 +0200 Subject: [PATCH 1/2] Fix for centos5 and jinja < 2.6 --- salt/formulas.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/formulas.jinja b/salt/formulas.jinja index 599659f63..1337281ab 100644 --- a/salt/formulas.jinja +++ b/salt/formulas.jinja @@ -11,7 +11,7 @@ {%- set value = salt['pillar.get']('salt_formulas:git_opts:{0}:{1}'.format(env, opt), salt['pillar.get']('salt_formulas:git_opts:default:{0}'.format(opt), defaults[opt])) -%} -{%- if value is mapping -%} +{%- if value is iterable -%} {{ value|yaml }} {%- else -%} {{ value }} From 02be0b13671968f2486dac62ee7bbfcda82ea768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Paw=C5=82owski?= Date: Mon, 21 Dec 2015 15:00:35 +0100 Subject: [PATCH 2/2] add support for returner setting in minion configuration --- salt/files/minion.d/f_defaults.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index b3cb6b391..b435690c3 100644 --- a/salt/files/minion.d/f_defaults.conf +++ b/salt/files/minion.d/f_defaults.conf @@ -360,3 +360,8 @@ pillar_roots: ############################################ # windows repo cache {{ get_config('win_repo_cachefile', 'salt://win/repo/winrepo.p') }} + +###### Returner settings ###### +############################################ +# default returner +{{ get_config('return', '') }}