From 0ff8dd45efbd4c4b76d8a50e7f21c9bb3df7b0b0 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 17 Aug 2015 08:16:24 -0400 Subject: [PATCH] Fix escaping problem in kube-scheduler manifest '{{pillar[log_level]}}' was appearing literally in the command line, instead of being substituted. Fixes #12787 --- .../saltbase/salt/kube-scheduler/kube-scheduler.manifest | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest index 4a70799bf17..73728c09749 100644 --- a/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest +++ b/cluster/saltbase/salt/kube-scheduler/kube-scheduler.manifest @@ -1,4 +1,8 @@ -{% set params = "{{pillar['log_level']}}" -%} +{% set params = "" -%} + +{% if pillar['log_level'] is defined -%} +{% set params = params + " " + pillar['log_level'] -%} +{% endif -%} # test_args has to be kept at the end, so they'll overwrite any prior configuration {% if pillar['scheduler_test_args'] is defined -%}