github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

getting 7bc7f47 fully right.

Browse Source 
given that etcd is disabled in the nodes we need to wait for master's etcd to be
available so that flanneld gets properly wired.

Signed-off-by: António Meireles <antonio.meireles@reformi.st>
This commit is contained in:
António Meireles 2015-03-28 12:29:27 +00:00
parent 8a7a127352
commit bb4071e8be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/getting-started-guides/aws/cloud-configs/node.yaml
View File

@ -6,6 +6,7 @@ coreos:
metadata: "role=node" metadata: "role=node"
flannel: flannel:
interface: eth1 interface: eth1
etcd_endpoints: http://<master-private-ip>:4001
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
@ -16,9 +17,8 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
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
command: start command: start

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

@ -6,6 +6,7 @@ coreos:
metadata: "role=node" metadata: "role=node"
flannel: flannel:
interface: eth1 interface: eth1
etcd_endpoints: http://<master-private-ip>:4001
units: units:
- name: etcd.service - name: etcd.service
mask: true mask: true
@ -16,9 +17,8 @@ coreos:
drop-ins: drop-ins:
- name: 50-network-config.conf - name: 50-network-config.conf
content: | content: |
[Unit]
Requires=etcd.service
[Service] [Service]
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
command: start command: start