diff --git a/cluster/saltbase/salt/kube-apiserver/default b/cluster/saltbase/salt/kube-apiserver/default
index cfcb55e98a0..731624ebef2 100644
--- a/cluster/saltbase/salt/kube-apiserver/default
+++ b/cluster/saltbase/salt/kube-apiserver/default
@@ -1,49 +1,49 @@
-{% set daemon_args = "$DAEMON_ARGS" %}
-{% if grains['os_family'] == 'RedHat' %}
-	{% set daemon_args = "" %}
-{% endif %}
+{% set daemon_args = "$DAEMON_ARGS" -%}
+{% if grains['os_family'] == 'RedHat' -%}
+	{% set daemon_args = "" -%}
+{% endif -%}
 
-{% set cloud_provider = "" %}
-{% if grains.cloud_provider is defined %}
-  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %}
-{% endif %}
+{% set cloud_provider = "" -%}
+{% if grains.cloud_provider is defined -%}
+  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
+{% endif -%}
 
-{% set address = "-address=127.0.0.1" %}
+{% set address = "-address=127.0.0.1" -%}
 
-{% set publicAddressOverride = "" %}
-{% if grains.publicAddressOverride is defined %}
-  {% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride %}
-{% endif %}
+{% set publicAddressOverride = "" -%}
+{% if grains.publicAddressOverride is defined -%}
+  {% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride -%}
+{% endif -%}
 
 
-{% if grains.etcd_servers is defined %}
-  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
-{% else %}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
-  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
-{% endif %}
+{% if grains.etcd_servers is defined -%}
+  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+{% else -%}
+  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
+  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
+{% endif -%}
 
-{% if grains.cloud is defined %}
-{% if grains.cloud == 'gce' %}
-  {% set cloud_provider = "-cloud_provider=gce" %}
-{% endif %}
-{% endif %}
+{% if grains.cloud is defined -%}
+{% if grains.cloud == 'gce' -%}
+  {% set cloud_provider = "-cloud_provider=gce" -%}
+{% endif -%}
+{% endif -%}
 
-{% if pillar['portal_net'] is defined %}
-  {% set portal_net = "-portal_net=" + pillar['portal_net'] %}
-{% endif %}
+{% if pillar['portal_net'] is defined -%}
+  {% set portal_net = "-portal_net=" + pillar['portal_net'] -%}
+{% endif -%}
 
-{% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" %}
-{% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" %}
+{% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" -%}
+{% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" -%}
 
-{% set secure_port = "-secure_port=6443" %}
-{% set token_auth_file = "-token_auth_file=/dev/null" %}
+{% set secure_port = "-secure_port=6443" -%}
+{% set token_auth_file = "-token_auth_file=/dev/null" -%}
 
-{% if grains.cloud is defined %}
-{% if grains.cloud == 'gce' %}
+{% if grains.cloud is defined -%}
+{% if grains.cloud == 'gce' -%}
     # TODO: generate and distribute tokens for other cloud providers.
-    {% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" %}
-{% endif %}
-{% endif %}
+    {% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" -%}
+{% endif -%}
+{% endif -%}
 
 DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}}"
diff --git a/cluster/saltbase/salt/kube-controller-manager/default b/cluster/saltbase/salt/kube-controller-manager/default
index acbf113ec8d..ab47e3ddc68 100644
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
@@ -1,49 +1,49 @@
-{% set daemon_args = "$DAEMON_ARGS" %}
-{% if grains['os_family'] == 'RedHat' %}
-	{% set daemon_args = "" %}
-{% endif %}
+{% set daemon_args = "$DAEMON_ARGS" -%}
+{% if grains['os_family'] == 'RedHat' -%}
+	{% set daemon_args = "" -%}
+{% endif -%}
 
-{% set master="-master=127.0.0.1:8080" %}
+{% set master="-master=127.0.0.1:8080" -%}
 
-{% set machines = ""%}
-{% set cloud_provider = "" %}
-{% set minion_regexp = "-minion_regexp=.*" %}
-{% if grains.cloud_provider is defined %}
-  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %}
-{% endif %}
+{% set machines = ""-%}
+{% set cloud_provider = "" -%}
+{% set minion_regexp = "-minion_regexp=.*" -%}
+{% if grains.cloud_provider is defined -%}
+  {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
+{% endif -%}
 
-{% if pillar['node_instance_prefix'] is defined %}
-  {% set minion_regexp = "-minion_regexp='" + pillar['node_instance_prefix'] + ".*'" %}
-{% endif %}
+{% if pillar['node_instance_prefix'] is defined -%}
+  {% set minion_regexp = "-minion_regexp='" + pillar['node_instance_prefix'] + ".*'" -%}
+{% endif -%}
 
-{% if grains.cloud is defined %}
-{% if grains.cloud == 'gce' %}
-  {% set cloud_provider = "-cloud_provider=gce" %}
-  {% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %}
-{% endif %}
-{% if grains.cloud == 'aws' %}
+{% if grains.cloud is defined -%}
+{% if grains.cloud == 'gce' -%}
+  {% set cloud_provider = "-cloud_provider=gce" -%}
+  {% set machines = "-machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
+{% endif -%}
+{% if grains.cloud == 'aws' -%}
   # TODO: turn on AWS as a cloud provider.  Need to figure out AWS role-based auth.
-  {% set cloud_provider = "" %}
-  {% set minion_regexp = "" %}
-  {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %}
-{% endif %}
-{% if grains.cloud == 'azure' %}
+  {% set cloud_provider = "" -%}
+  {% set minion_regexp = "" -%}
+  {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
+{% endif -%}
+{% if grains.cloud == 'azure' -%}
   MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}"
-  {% set machines = "-machines=$MACHINES" %}
-{% endif %}
-{% if grains.cloud == 'vsphere' %}
+  {% set machines = "-machines=$MACHINES" -%}
+{% endif -%}
+{% if grains.cloud == 'vsphere' -%}
   # Collect IPs of minions as machines list.
   #
   # Use a bash array to build the value we need. Jinja 2.7 does support a 'map'
   # filter that would simplify this.  However, some installations (specifically
   # Debian Wheezy) only install Jinja 2.6.
   MACHINE_IPS=()
-  {% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() %}
+  {% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() -%}
   MACHINE_IPS+=( {{ addrs[0] }} )
-  {% endfor %}
-  {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %}
-  {% set minion_regexp = "" %}
-{% endif %}
-{% endif %}
+  {% endfor -%}
+  {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" -%}
+  {% set minion_regexp = "" -%}
+{% endif -%}
+{% endif -%}
 
 DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}"
diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default
index 45e7a44f1a7..013dfd2db59 100644
--- a/cluster/saltbase/salt/kube-proxy/default
+++ b/cluster/saltbase/salt/kube-proxy/default
@@ -1,11 +1,12 @@
-{% set daemon_args = "$DAEMON_ARGS" %}
-{% if grains['os_family'] == 'RedHat' %}
-	{% set daemon_args = "" %}
-{% endif %}
-{% if grains.etcd_servers is defined %}
-  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
-{% else %}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
-  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
-{% endif %}
+{% set daemon_args = "$DAEMON_ARGS" -%}
+{% if grains['os_family'] == 'RedHat' -%}
+	{% set daemon_args = "" -%}
+{% endif -%}
+{% if grains.etcd_servers is defined -%}
+  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+{% else -%}
+  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
+  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
+{% endif -%}
+
 DAEMON_ARGS="{{daemon_args}} {{etcd_servers}}"
diff --git a/cluster/saltbase/salt/kube-scheduler/default b/cluster/saltbase/salt/kube-scheduler/default
index e4a89682e62..fc928d81deb 100644
--- a/cluster/saltbase/salt/kube-scheduler/default
+++ b/cluster/saltbase/salt/kube-scheduler/default
@@ -1,6 +1,7 @@
-{% set daemon_args = "$DAEMON_ARGS" %}
-{% if grains['os_family'] == 'RedHat' %}
-	{% set daemon_args = "" %}
-{% endif %}
-{% set master="-master=127.0.0.1:8080" %}
+{% set daemon_args = "$DAEMON_ARGS" -%}
+{% if grains['os_family'] == 'RedHat' -%}
+	{% set daemon_args = "" -%}
+{% endif -%}
+{% set master="-master=127.0.0.1:8080" -%}
+
 DAEMON_ARGS="{{daemon_args}} {{master}}"
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index d50172d40ba..d9f24d3eb6a 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -1,28 +1,28 @@
-{% set daemon_args = "$DAEMON_ARGS" %}
-{% if grains['os_family'] == 'RedHat' %}
-  {% set daemon_args = "" %}
-{% endif %}
-{% if grains.etcd_servers is defined %}
-  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %}
-{% else %}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
-  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
-{% endif %}
+{% set daemon_args = "$DAEMON_ARGS" -%}
+{% if grains['os_family'] == 'RedHat' -%}
+  {% set daemon_args = "" -%}
+{% endif -%}
+{% if grains.etcd_servers is defined -%}
+  {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+{% else -%}
+  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
+  {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
+{% endif -%}
 
-{% if grains.apiservers is defined %}
-  {% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" %}
-{% else %}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() %}
-  {% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" %}
-{% endif %}
+{% if grains.apiservers is defined -%}
+  {% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" -%}
+{% else -%}
+  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
+  {% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" -%}
+{% endif -%}
 
-{% set address = "-address=0.0.0.0" %}
-{% set config = "-config=/etc/kubernetes/manifests" %}
-{% set hostname_override = "" %}
-{% if grains.minion_ip is defined %}
-  {% set hostname_override = " -hostname_override=" + grains.minion_ip %}
-{% endif %}
+{% set address = "-address=0.0.0.0" -%}
+{% set config = "-config=/etc/kubernetes/manifests" -%}
+{% set hostname_override = "" -%}
+{% if grains.minion_ip is defined -%}
+  {% set hostname_override = " -hostname_override=" + grains.minion_ip -%}
+{% endif -%}
 
-{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" %}
+{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" -%}
 
 DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}}"