Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #7498 - CoreOS Getting Started Guide had invalid cloud config #7499

Merged
merged 1 commit into from Apr 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -12,7 +12,6 @@ coreos:
etcd-servers: http://localhost:4001
metadata: "role=master"
flannel:
interface: eth1
units:
- name: setup-network-environment.service
command: start
Expand Down
2 changes: 1 addition & 1 deletion docs/getting-started-guides/coreos/cloud-configs/node.yaml
Expand Up @@ -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
Expand All @@ -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
Expand Down