Improve vagrant reliablility, fix race condition with openvswitch and docker

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 %}
-

cluster/saltbase/salt/sdn/init.sls

@@ -1,15 +1,8 @@
 {% if grains.network_mode is defined and grains.network_mode == 'openvswitch' %}
 
-openvswitch:
-  pkg:
-    - installed
-  service.running:
-    - enable: True
-
 sdn:
   cmd.wait:
     - name: /kubernetes-vagrant/network_closure.sh
     - watch:
-      - pkg: docker-io
-      - pkg: openvswitch
+      - sls: docker
 {% endif %}

cluster/saltbase/salt/top.sls

@@ -37,7 +37,9 @@ base:
     - monit
     - nginx
     - kube-client-tools
+{% if grains['cloud'] is defined and grains['cloud'] != 'vagrant' %}
     - logrotate
+{% endif %}
     - kube-addons
 {% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
     - openvpn