Revert "Fix vagrant networking"

2015-02-09 13:40:11 -08:00
parent 5f3bc33d01
commit 6b8c332cd3
6 changed files with 77 additions and 88 deletions
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -70,7 +70,4 @@ 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 %}

--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -40,9 +40,6 @@ base:
    - kube-addons
 {% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
    - openvpn
-{% else %}
-    - docker
-    - sdn
 {% endif %}

  'roles:kubernetes-pool-vsphere':