diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index be7c2a4..8781d4a 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -248,8 +248,12 @@
 /opt/cni/bin:
   archive.extracted:
     - source: {{ common.cni.plugins.source }}
-    - source_hash: md5={{ common.cni.plugins.hash }}
+    - source_hash: {{ common.cni.plugins.hash }}
+    {%- if grains['saltversioninfo'] < [2017, 7] %}
     - tar_options: xzf
+    {%- else %}
+    - options: xzf
+    {%- endif %}
     - archive_format: tar
     - if_missing: /opt/cni/bin/host-local
 {%- endif %}
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 06f2cf4..19d233e 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -29,10 +29,8 @@
 {%- else %}
 --node-labels=node-role.kubernetes.io/node=true \
 {%- endif %}
-{%- if pool.network.opencontrail is not defined or ( pool.network.opencontrail is defined and  pool.network.opencontrail.enabled == True ) %}
 --network-plugin=cni \
 --cni-bin-dir={{ pool.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
-{%- endif %}
 --file-check-frequency={{ pool.kubelet.frequency }} \
 {%- if common.get('cloudprovider', {}).get('enabled') %}
 --cloud-provider={{ common.cloudprovider.provider }} \