Merge pull request #22254 from vmware/vsphere-pod-cidr-fix

Auto commit by PR queue bot
2016-03-04 04:17:44 -08:00
parent 6a6fcc8c2b fe7568d099
commit 09313b0847
7 changed files with 49 additions and 14 deletions
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -80,7 +80,3 @@ base:
 {% if pillar.get('network_provider', '').lower() == 'opencontrail' %}
    - opencontrail-networking-master
 {% endif %}
-
-  'roles:kubernetes-pool-vsphere':
-    - match: grain
-    - static-routes