Add require for criproxy states. Also remove dockershim if containerd enabled
Change-Id: I71c1329869d5336e96830ad5b59b20d28a4fcea2
Realted-PROD: PROD-29367
diff --git a/kubernetes/_common.sls b/kubernetes/_common.sls
index 3d59fbf..b4762a1 100644
--- a/kubernetes/_common.sls
+++ b/kubernetes/_common.sls
@@ -115,6 +115,13 @@
- onlyif: /bin/false
{%- endif %}
+{%- else %}
+
+dockershim_service:
+ service.dead:
+ - name: dockershim
+ - enable: False
+
{%- endif %}
/usr/bin/criproxy:
@@ -164,6 +171,10 @@
- file: /etc/systemd/system/criproxy.service
- file: /etc/criproxy/node.conf
- file: /usr/bin/criproxy
+ - require:
+ - file: /etc/systemd/system/criproxy.service
+ - file: /etc/criproxy/node.conf
+ - file: /usr/bin/criproxy
{%- if grains.get('noservices') %}
- onlyif: /bin/false
{%- endif %}