From 0de0e3e9f11d4da2a85538a2c085de48a9dad757 Mon Sep 17 00:00:00 2001 From: derekwaynecarr Date: Wed, 5 Aug 2015 17:01:43 -0400 Subject: [PATCH] Fix salt configuration on systemd setups --- cluster/saltbase/salt/kube-proxy/default | 4 +--- cluster/saltbase/salt/kubelet/default | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default index ae9dbc60e44..f53bd2b2111 100644 --- 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}}" diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default index 53810689eee..e9112da9c07 100644 --- a/cluster/saltbase/salt/kubelet/default +++ b/cluster/saltbase/salt/kubelet/default @@ -95,7 +95,5 @@ {% set test_args=pillar['kubelet_test_args'] %} {% endif -%} -DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}}" - # 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}} {{debugging_handlers}} {{hostname_override}} {{cloud_provider}} {{config}} {{manifest_url}} --allow_privileged={{pillar['allow_privileged']}} {{pillar['log_level']}} {{cluster_dns}} {{cluster_domain}} {{docker_root}} {{kubelet_root}} {{configure_cbr0}} {{cgroup_root}} {{system_container}} {{pod_cidr}} {{test_args}}"