From 1891ba029c56080b5ee5f792da5d09d46565880e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Mon, 16 Mar 2015 16:26:57 +0000 Subject: [PATCH] in CoreOS configs enforce that docker starts only after flanneld is running. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: António Meireles --- docs/getting-started-guides/aws/cloud-configs/master.yaml | 6 ++++-- docs/getting-started-guides/aws/cloud-configs/node.yaml | 5 +++++ .../getting-started-guides/coreos/cloud-configs/master.yaml | 6 ++++-- docs/getting-started-guides/coreos/cloud-configs/node.yaml | 5 +++++ .../coreos/cloud-configs/standalone.yaml | 6 ++++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/docs/getting-started-guides/aws/cloud-configs/master.yaml b/docs/getting-started-guides/aws/cloud-configs/master.yaml index 828975eecaf..72613a4ed25 100644 --- 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 index 73372abc2e3..59c24c5f24f 100644 --- 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://: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 index 4b8d6344a46..25fd8cee24d 100644 --- 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 index e2c31ff5dc6..ab4d2dc08bc 100644 --- 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://: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 index 7bf7a4a80fd..7c95ac502b7 100644 --- 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