github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19819 from ysh7/master

Browse Source 
Problem with centos cluster creation script
This commit is contained in:
Alex Mohr
2016-01-21 10:35:09 -08:00
parent 94b2490eba c171a96d15
commit 766ee6cf0b
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/centos/node/scripts/docker.sh
View File

@@ -35,7 +35,6 @@ Type=notify
EnvironmentFile=-/run/flannel/docker EnvironmentFile=-/run/flannel/docker
EnvironmentFile=-/opt/kubernetes/cfg/docker EnvironmentFile=-/opt/kubernetes/cfg/docker
WorkingDirectory=/opt/kubernetes/bin WorkingDirectory=/opt/kubernetes/bin
ExecStartPre=/opt/kubernetes/bin/remove-docker0.sh
ExecStart=/opt/kubernetes/bin/docker daemon \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPTS ExecStart=/opt/kubernetes/bin/docker daemon \$DOCKER_OPT_BIP \$DOCKER_OPT_MTU \$DOCKER_OPTS
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576

1
cluster/centos/node/scripts/flannel.sh
View File

@@ -32,6 +32,7 @@ Before=docker.service
[Service] [Service]
EnvironmentFile=-/opt/kubernetes/cfg/flannel EnvironmentFile=-/opt/kubernetes/cfg/flannel
ExecStartPre=/opt/kubernetes/bin/remove-docker0.sh
ExecStart=/opt/kubernetes/bin/flanneld --ip-masq \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY} ExecStart=/opt/kubernetes/bin/flanneld --ip-masq \${FLANNEL_ETCD} \${FLANNEL_ETCD_KEY}
ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker ExecStartPost=/opt/kubernetes/bin/mk-docker-opts.sh -d /run/flannel/docker