Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

minor clean upstart script for ubuntu #15822

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions cluster/ubuntu/reconfDocker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function config_etcd {
else
# enough timeout??
if (( attempt > 600 )); then
echo "timeout for waiting network config" > ~/kube/err.log
echo "timeout waiting for /coreos.com/network/config" >> ~/kube/err.log
exit 2
fi

Expand All @@ -46,8 +46,17 @@ function config_etcd {
}

function restart_docker {
#wait some secs for /run/flannel/subnet.env ready
sleep 15

attempt=0
while [[ ! -f /run/flannel/subnet.env ]]; do
if (( attempt > 200 )); then
echo "timeout waiting for /run/flannel/subnet.env" >> ~/kube/err.log
exit 2
fi
attempt=$((attempt+1))
sleep 3
done

sudo ip link set dev docker0 down
sudo brctl delbr docker0

Expand Down