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

enhance lsb_release detection for multi-docker

Browse Source
This commit is contained in:
He Simei 2015-10-08 15:22:16 +08:00
parent e3c6750942
commit 31f7d33d29
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/getting-started-guides/docker-multinode/master.sh
View File

@ -75,6 +75,15 @@ detect_lsb() {
fi fi
lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')" lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
case "${lsb_dist}" in
amzn|centos|debian|ubuntu)
;;
*)
echo "Error: We currently only support ubuntu|debian|amzn|centos."
exit 1
;;
esac
} }
@ -106,7 +115,7 @@ start_k8s(){
source subnet.env source subnet.env
# Configure docker net settings, then restart it # Configure docker net settings, then restart it
case "$lsb_dist" in case "${lsb_dist}" in
amzn) amzn)
DOCKER_CONF="/etc/sysconfig/docker" DOCKER_CONF="/etc/sysconfig/docker"
echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF} echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
@ -129,7 +138,7 @@ start_k8s(){
apt-get install bridge-utils && brctl delbr docker0 && service docker restart apt-get install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
*) *)
echo "Unsupported operations system $lsb_dist" echo "Unsupported operations system ${lsb_dist}"
exit 1 exit 1
;; ;;
esac esac

13
docs/getting-started-guides/docker-multinode/worker.sh
View File

@ -84,6 +84,15 @@ detect_lsb() {
fi fi
lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')" lsb_dist="$(echo ${lsb_dist} | tr '[:upper:]' '[:lower:]')"
case "${lsb_dist}" in
amzn|centos|debian|ubuntu)
;;
*)
echo "Error: We currently only support ubuntu|debian|amzn|centos."
exit 1
;;
esac
} }
@ -108,7 +117,7 @@ start_k8s() {
source subnet.env source subnet.env
# Configure docker net settings, then restart it # Configure docker net settings, then restart it
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}\"" | sudo tee -a ${DOCKER_CONF} echo "OPTIONS=\"\$OPTIONS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
@ -131,7 +140,7 @@ start_k8s() {
apt-get install bridge-utils && brctl delbr docker0 && service docker restart apt-get install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
*) *)
echo "Unsupported operations system $lsb_dist" echo "Unsupported operations system ${lsb_dist}"
exit 1 exit 1
;; ;;
esac esac