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