scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4425 from pires/fix_flannel_key_etcd

Browse Source 
Fixes #4309 #4362
This commit is contained in:
Brian Grant
2015-02-17 09:59:44 -08:00
parent f3ec56bba6 4c2819c5eb
commit 76ed22ab07
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/getting-started-guides/aws/cloud-configs/master.yaml
View File

@@ -103,7 +103,7 @@ coreos:
ExecStartPre=-/usr/bin/mkdir -p /opt/bin ExecStartPre=-/usr/bin/mkdir -p /opt/bin
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
ExecStartPre=/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=/opt/bin/flanneld ExecStart=/opt/bin/flanneld
- name: kube-apiserver.service - name: kube-apiserver.service
command: start command: start

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

@@ -103,7 +103,7 @@ coreos:
ExecStartPre=-/usr/bin/mkdir -p /opt/bin ExecStartPre=-/usr/bin/mkdir -p /opt/bin
ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld
ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld
ExecStartPre=/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}' ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{"Network":"10.244.0.0/16", "Backend": {"Type": "vxlan"}}'
ExecStart=/opt/bin/flanneld ExecStart=/opt/bin/flanneld
- name: kube-apiserver.service - name: kube-apiserver.service
command: start command: start