Fix salt configuration on systemd setups

2015-08-05 17:01:43 -04:00
parent b12ef5c397
commit 0de0e3e9f1
2 changed files with 2 additions and 6 deletions
--- a/cluster/saltbase/salt/kube-proxy/default
+++ b/cluster/saltbase/salt/kube-proxy/default
@@ -31,7 +31,5 @@
  {% set test_args=pillar['kubeproxy_test_args'] %}
 {% endif -%}

-DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}}"
-
 # test_args has to be kept at the end, so they'll overwrite any prior configuration
-DAEMON_ARGS="$DAEMON_ARGS + {{test_args}}"
+DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}} {{test_args}}"