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

Merge pull request #15290 from ZJU-SEL/enhance-lsb_release

Browse Source 
enhance lsb_release detection for multi-docker
This commit is contained in:
Dawn Chen
2015-10-12 14:47:03 -07:00
parent 2dd5b2b1d9 31f7d33d29
commit f27e0b2a16
2 changed files with 42 additions and 24 deletions
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
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
# Configure docker net settings, then restart it
case "$lsb_dist" in
case "${lsb_dist}" in
amzn)
DOCKER_CONF="/etc/sysconfig/docker"
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
;;
*)
echo "Unsupported operations system $lsb_dist"
echo "Unsupported operations system ${lsb_dist}"
exit 1
;;
esac

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

@@ -84,6 +84,15 @@ detect_lsb() {
fi
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
# Configure docker net settings, then restart it
case "$lsb_dist" in
case "${lsb_dist}" in
centos)
DOCKER_CONF="/etc/sysconfig/docker"
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
;;
*)
echo "Unsupported operations system $lsb_dist"
echo "Unsupported operations system ${lsb_dist}"
exit 1
;;
esac