in CoreOS configs enforce that docker starts only after flanneld is r…

…unning. Signed-off-by: António Meireles <antonio.meireles@reformi.st>
penland365 · Mar 17, 2015 · 1891ba0 · 1891ba0
1 parent 07461f9
commit 1891ba0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml
@@ -111,8 +111,10 @@ coreos:
         - name: 51-docker-mirror.conf
           content: |
             [Unit]
-            Requires=docker-cache.service
-            After=docker-cache.service
+            # making sure that docker-cache is up and that flanneld finished
+            # startup, otherwise containers won't land in flannel's network...
+            Requires=docker-cache.service flanneld.service
+            After=docker-cache.service flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
     - name: kube-apiserver.service

diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml
@@ -32,6 +32,11 @@ coreos:
       drop-ins:
         - name: 51-docker-mirror.conf
           content: |
+            [Unit]
+            # making sure that flanneld finished startup, otherwise containers
+            # won't land in flannel's network...
+            Requires=flanneld.service
+            After=flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--registry-mirror=http://<master-private-ip>:5000'
     - name: setup-network-environment.service

diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml
@@ -113,8 +113,10 @@ coreos:
         - name: 51-docker-mirror.conf
           content: |
             [Unit]
-            Requires=docker-cache.service
-            After=docker-cache.service
+            # making sure that docker-cache is up and that flanneld finished
+            # startup, otherwise containers won't land in flannel's network...
+            Requires=docker-cache.service flanneld.service
+            After=docker-cache.service flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
     - name: kube-apiserver.service

diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml
@@ -29,6 +29,11 @@ coreos:
       drop-ins:
         - name: 51-docker-mirror.conf
           content: |
+            [Unit]
+            # making sure that flanneld finished startup, otherwise containers
+            # won't land in flannel's network...
+            Requires=flanneld.service
+            After=flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--registry-mirror=http://<master-private-ip>:5000'
     - name: setup-network-environment.service

diff --git a/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml b/docs/getting-started-guides/coreos/cloud-configs/standalone.yaml
@@ -75,8 +75,10 @@ coreos:
         - name: 51-docker-mirror.conf
           content: |
             [Unit]
-            Requires=docker-cache.service
-            After=docker-cache.service
+            # making sure that docker-cache is up and that flanneld finished
+            # startup, otherwise containers won't land in flannel's network...
+            Requires=docker-cache.service flanneld.service
+            After=docker-cache.service flanneld.service
             [Service]
             Environment=DOCKER_OPTS='--registry-mirror=http://$private_ipv4:5000'
     - name: kube-apiserver.service