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

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

@ -50,12 +50,12 @@ lsb_dist=""
# Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist # Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
detect_lsb() { detect_lsb() {
case "$(uname -m)" in case "$(uname -m)" in
*64) *64)
;; ;;
*) *)
echo "Error: We currently only support 64-bit platforms." echo "Error: We currently only support 64-bit platforms."
exit 1 exit 1
;; ;;
esac esac
if command_exists lsb_release; then if command_exists lsb_release; then
@ -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,13 +115,13 @@ 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}
ifconfig docker0 down ifconfig docker0 down
yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
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}
@ -121,17 +130,17 @@ start_k8s(){
fi fi
ifconfig docker0 down ifconfig docker0 down
yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker
;; ;;
ubuntu|debian) ubuntu|debian)
DOCKER_CONF="/etc/default/docker" DOCKER_CONF="/etc/default/docker"
echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF} echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
ifconfig docker0 down ifconfig docker0 down
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
# sleep a little bit # sleep a little bit

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

@ -59,12 +59,12 @@ lsb_dist=""
# Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist # Detect the OS distro, we support ubuntu, debian, mint, centos, fedora dist
detect_lsb() { detect_lsb() {
case "$(uname -m)" in case "$(uname -m)" in
*64) *64)
;; ;;
*) *)
echo "Error: We currently only support 64-bit platforms." echo "Error: We currently only support 64-bit platforms."
exit 1 exit 1
;; ;;
esac esac
if command_exists lsb_release; then if command_exists lsb_release; then
@ -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}
@ -117,23 +126,23 @@ start_k8s() {
fi fi
ifconfig docker0 down ifconfig docker0 down
yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker yum -y -q install bridge-utils && brctl delbr docker0 && systemctl restart docker
;; ;;
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}
ifconfig docker0 down ifconfig docker0 down
yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart yum -y -q install bridge-utils && brctl delbr docker0 && service docker restart
;; ;;
ubuntu|debian) ubuntu|debian)
DOCKER_CONF="/etc/default/docker" DOCKER_CONF="/etc/default/docker"
echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF} echo "DOCKER_OPTS=\"\$DOCKER_OPTS --mtu=${FLANNEL_MTU} --bip=${FLANNEL_SUBNET}\"" | sudo tee -a ${DOCKER_CONF}
ifconfig docker0 down ifconfig docker0 down
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
# sleep a little bit # sleep a little bit