Merge pull request #114 from tarvip/ephemeral-storage-deps

Ensure ephemeral storage is prepared before docker starts
kubernetes-retired · Dec 3, 2016 · 2721a47 · 2721a47
2 parents ed09dd9 + 22a34a6
commit 2721a47
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/config/templates/cloud-config-controller b/config/templates/cloud-config-controller
@@ -37,6 +37,13 @@ coreos:
 {{end}}
     - name: docker.service
       drop-ins:
+{{if .Experimental.EphemeralImageStorage.Enabled}}
+        - name: 10-docker-mount.conf
+          content: |
+            [Unit]
+            After=var-lib-docker.mount
+            Wants=var-lib-docker.mount
+{{end}}
         - name: 40-flannel.conf
           content: |
             [Unit]

diff --git a/config/templates/cloud-config-worker b/config/templates/cloud-config-worker
@@ -12,6 +12,13 @@ coreos:
   units:
     - name: docker.service
       drop-ins:
+{{if .Experimental.EphemeralImageStorage.Enabled}}
+        - name: 10-docker-mount.conf
+          content: |
+            [Unit]
+            After=var-lib-docker.mount
+            Wants=var-lib-docker.mount
+{{end}}
         - name: 40-flannel.conf
           content: |
             [Unit]