github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6135 from AntonioMeireles/master

Browse Source 
getting 7bc7f47 fully right.
This commit is contained in:
Brendan Burns 2015-03-30 12:27:28 -07:00
commit 4659a12d6b
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