github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config
This commit is contained in:
CJ Cullen
2015-04-29 10:07:49 -07:00
parent 6c22007060 f5e81c25c9
commit a529c0e0f3
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/getting-started-guides/coreos/cloud-configs/master.yaml
View File

@@ -12,7 +12,6 @@ coreos:
etcd-servers: http://localhost:4001 etcd-servers: http://localhost:4001
metadata: "role=master" metadata: "role=master"
flannel: flannel:
interface: eth1
units: units:
- name: setup-network-environment.service - name: setup-network-environment.service
command: start command: start

2
docs/getting-started-guides/coreos/cloud-configs/node.yaml
View File

@@ -5,7 +5,6 @@ coreos:
etcd-servers: http://<master-private-ip>:4001 etcd-servers: http://<master-private-ip>:4001
metadata: "role=node" metadata: "role=node"
flannel: flannel:
interface: eth1
etcd_endpoints: http://<master-private-ip>:4001 etcd_endpoints: http://<master-private-ip>:4001
units: units:
- name: etcd.service - name: etcd.service
@@ -18,6 +17,7 @@ coreos:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Service] [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=/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"}}' ExecStartPre=/usr/bin/etcdctl set /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
- name: docker.service - name: docker.service