Improve vagrant reliablility, fix race condition with openvswitch and docker

2015-02-21 13:31:50 -05:00
parent 86a0193f51
commit 87a41b0934
6 changed files with 34 additions and 12 deletions
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -72,7 +72,3 @@ kubelet:
      - file: /etc/init.d/kubelet
 {% endif %}
      - file: /var/lib/kubelet/kubernetes_auth
-{% if grains.network_mode is defined and grains.network_mode == 'openvswitch' %}
-      - sls: sdn
-{% endif %}
-