From f5e81c25c9a4caf793409721bb1145e09f214e05 Mon Sep 17 00:00:00 2001 From: Elson Rodriguez Date: Tue, 28 Apr 2015 23:04:11 -0700 Subject: [PATCH] Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config Fixed node.yml and master.yml to work in environments where eth1 does not exist. Also included an explicit setting for etcdctl in the flannel config --- docs/getting-started-guides/coreos/cloud-configs/master.yaml | 1 - docs/getting-started-guides/coreos/cloud-configs/node.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/getting-started-guides/coreos/cloud-configs/master.yaml b/docs/getting-started-guides/coreos/cloud-configs/master.yaml index e1fadc458ba..013e6613ced 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/master.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/master.yaml @@ -12,7 +12,6 @@ coreos: etcd-servers: http://localhost:4001 metadata: "role=master" flannel: - interface: eth1 units: - name: setup-network-environment.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 6fee0f66f59..57d0b88a04f 100644 --- a/docs/getting-started-guides/coreos/cloud-configs/node.yaml +++ b/docs/getting-started-guides/coreos/cloud-configs/node.yaml @@ -5,7 +5,6 @@ coreos: etcd-servers: http://:4001 metadata: "role=node" flannel: - interface: eth1 etcd_endpoints: http://:4001 units: - name: etcd.service @@ -18,6 +17,7 @@ coreos: - name: 50-network-config.conf content: | [Service] + Environment=ETCDCTL_PEERS=http://:4001 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