Merge pull request #7499 from elsonrodriguez/coreos-example-fix

Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config
kubernetes · Apr 29, 2015 · a529c0e · a529c0e
2 parents 6c22007 + f5e81c2
commit a529c0e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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