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

Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config
f5e81c25 · Elson Rodriguez · 7dcce2ee · f5e81c25 · f5e81c25
Commit f5e81c25 authored Apr 28, 2015 by Elson Rodriguez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

master.yaml docs/getting-started-guides/coreos/cloud-configs/master.yaml +0 -1

node.yaml docs/getting-started-guides/coreos/cloud-configs/node.yaml +1 -1

No files found.
--- 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

--- 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://<master-private-ip>:4001
    metadata: "role=node"
  flannel:
-    interface: eth1
    etcd_endpoints: http://<master-private-ip>:4001
  units:
    - name: etcd.service
@@ -18,6 +17,7 @@ coreos:
        - name: 50-network-config.conf
          content: |
            [Service]
+            Environment=ETCDCTL_PEERS=http://<master-private-ip>:4001
            ExecStartPre=/bin/bash -c "until curl http://<master-private-ip>: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