Optimize 'noservices' condition
Change-Id: I8f823143065ebd518a3acad2902089aecc3a5436
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index ce62b38..a238128 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -127,9 +127,9 @@
- file: /usr/bin/hyperkube
- file: /etc/kubernetes/kubelet.kubeconfig
- file: manifest_dir_create
- {% if grains.noservices is defined %}
- - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
- {% endif %}
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
{%- if common.logrotate is defined %}
/etc/logrotate.d/kubernetes:
diff --git a/kubernetes/pool/kube-proxy.sls b/kubernetes/pool/kube-proxy.sls
index cf0ad12..b57ae6c 100644
--- a/kubernetes/pool/kube-proxy.sls
+++ b/kubernetes/pool/kube-proxy.sls
@@ -47,9 +47,9 @@
- file: /etc/default/kube-proxy
- file: /usr/bin/hyperkube
- file: /etc/kubernetes/proxy.kubeconfig
- {% if grains.noservices is defined %}
- - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
- {% endif %}
+ {%- if grains.get('noservices') %}
+ - onlyif: /bin/false
+ {%- endif %}
{%- endif %}