getting 7bc7f47 fully right.

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

View File

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

View File

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