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

cluster/saltbase/salt/docker/default

@@ -0,0 +1,8 @@
+{% set docker_opts = "" -%}
+{% if grains.docker_opts is defined -%}
+  {% set docker_opts = grains.docker_opts -%}
+{% endif -%}
+
+DOCKER_OPTS='{{docker_opts}}'
+OPTIONS='{{docker_opts}}'
+DOCKER_CERT_PATH=/etc/docker

cluster/saltbase/salt/docker/init.sls

@@ -8,15 +8,28 @@ bridge-utils:
   pkg.installed
 
 {% if grains.os_family == 'RedHat' %}
+
 docker-io:
   pkg:
     - installed
 
+{{ environment_file }}:
+  file.managed:
+    - source: salt://docker/default
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+    - makedirs: true
+
 docker:
   service.running:
     - enable: True
     - require:
       - pkg: docker-io
+    - watch:
+      - file: {{ environment_file }}
+      - pkg: docker-io
 
 {% else %}
 

cluster/saltbase/salt/kubelet/default

@@ -26,8 +26,9 @@
 # the debugging handlers (/run and /exec) to prevent arbitrary code execution on
 # the master.
 # TODO(roberthbailey): Make this configurable via an env var in config-default.sh
+
 {% set debugging_handlers = "--enable-debugging-handlers=true" -%}
-{% if grains.cloud == 'gce' -%}
+{% if grains.cloud in ['gce', 'vagrant'] -%}
   {% if grains['roles'][0] == 'kubernetes-master' -%}
     {% set api_servers_with_port = "" -%}
     {% set debugging_handlers = "--enable-debugging-handlers=false" -%}

cluster/saltbase/salt/sdn/init.sls

@@ -1,14 +0,0 @@
-{% if grains.network_mode is defined and grains.network_mode == 'openvswitch' %}
-
-
-sdn:
-  cmd.script:
-    - source: /kubernetes-vagrant/network_closure.sh
-    - require:
-      - pkg: docker-io
-      - sls: kubelet
-    - cwd: /
-    - user: root
-    - group: root
-    - shell: /bin/bash
-{% endif %}

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