From bb4071e8be4063788f7cd2f98754449cb0b0928b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Meireles?= Date: Sat, 28 Mar 2015 12:29:27 +0000 Subject: [PATCH] getting 7bc7f47 fully right. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit given that etcd is disabled in the nodes we need to wait for master's etcd to be available so that flanneld gets properly wired. Signed-off-by: António Meireles --- docs/getting-started-guides/aws/cloud-configs/node.yaml | 4 ++-- docs/getting-started-guides/coreos/cloud-configs/node.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/getting-started-guides/aws/cloud-configs/node.yaml b/docs/getting-started-guides/aws/cloud-configs/node.yaml index d88fe92b753..e21959fda06 100644 --- a/docs/getting-started-guides/aws/cloud-configs/node.yaml +++ b/docs/getting-started-guides/aws/cloud-configs/node.yaml @@ -6,6 +6,7 @@ coreos: metadata: "role=node" flannel: interface: eth1 + etcd_endpoints: http://:4001 units: - name: etcd.service mask: true @@ -16,9 +17,8 @@ coreos: drop-ins: - name: 50-network-config.conf content: | - [Unit] - Requires=etcd.service [Service] + ExecStartPre=/bin/bash -c "until curl http://:4001/v2/machines; do sleep 2; done" ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' - name: docker.service command: start diff --git a/docs/getting-started-guides/coreos/cloud-configs/node.yaml b/docs/getting-started-guides/coreos/cloud-configs/node.yaml index 5c9a28ee153..6fee0f66f59 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/node.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/node.yaml @@ -6,6 +6,7 @@ coreos: metadata: "role=node" flannel: interface: eth1 + etcd_endpoints: http://:4001 units: - name: etcd.service mask: true @@ -16,9 +17,8 @@ coreos: drop-ins: - name: 50-network-config.conf content: | - [Unit] - Requires=etcd.service [Service] + ExecStartPre=/bin/bash -c "until curl http://:4001/v2/machines; do sleep 2; done" ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' - name: docker.service command: start