whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #320 from f-higashi/docker_multinode_centos

Browse Source 
Fix docker options setting in CentOS
This commit is contained in:
johndmulhausen
2016-04-12 16:34:16 -07:00
parent 9ced663a87 2df9177e9b
commit 0cabf01686
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/getting-started-guides/docker-multinode/master.sh
+1 -1
View File
@@ -176,7 +176,7 @@ start_k8s(){
;; ;;
centos) centos)
DOCKER_CONF="/etc/sysconfig/docker" DOCKER_CONF="/etc/sysconfig/docker"
echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | tee -a ${DOCKER_CONF} sed -i "/^OPTIONS=/ s|\( --mtu=.*\)\?'$| --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}'|" ${DOCKER_CONF}
if ! command_exists ifconfig; then if ! command_exists ifconfig; then
yum -y -q install net-tools yum -y -q install net-tools
fi fi
docs/getting-started-guides/docker-multinode/worker.sh
+1 -1
View File
@@ -149,7 +149,7 @@ start_k8s() {
case "${lsb_dist}" in case "${lsb_dist}" in
centos) centos)
DOCKER_CONF="/etc/sysconfig/docker" DOCKER_CONF="/etc/sysconfig/docker"
echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | tee -a ${DOCKER_CONF} sed -i "/^OPTIONS=/ s|\( --mtu=.*\)\?'$| --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}'|" ${DOCKER_CONF}
if ! command_exists ifconfig; then if ! command_exists ifconfig; then
yum -y -q install net-tools yum -y -q install net-tools
fi fi