Merge pull request deis#4742 from krancour/docker-needs-flannel

fix(contrib): Add drop-in to make docker require flannel
iamstoick · Nov 11, 2015 · 27eab71 · 27eab71
2 parents e1e3927 + 534aefc
commit 27eab71
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/contrib/coreos/user-data.example b/contrib/coreos/user-data.example
@@ -43,6 +43,11 @@ coreos:
       enable: false
     - name: docker.service
       drop-ins:
+      - name: 10-require-flannel.conf
+        content: |
+          [Unit]
+          Requires=flanneld.service
+          After=flanneld.service
       - name: 50-insecure-registry.conf
         content: |
           [Service]