Upgrade to Fedora 21, Docker 1.6, clean-up SDN

2015-06-01 21:19:38 -04:00
parent a161edb396
commit 2168cee414
11 changed files with 137 additions and 94 deletions
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -8,8 +8,6 @@ base:
    - docker
 {% if grains['cloud'] is defined and grains['cloud'] == 'azure' %}
    - openvpn-client
-{% else %}
-    - sdn
 {% endif %}
    - helpers
    - cadvisor
@@ -50,7 +48,6 @@ base:
 {% if grains['cloud'] is defined and grains['cloud'] == 'vagrant' %}
    - docker
    - kubelet
-    - sdn
 {% endif %}
 {% if grains['cloud'] is defined and grains['cloud'] == 'aws' %}
    - docker