github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6148 from zmerlynn/brctl_complaint

Browse Source 
Fix "brctl: invalid command" message appearing in startup logs
This commit is contained in:
Victor Marmol 2015-03-30 08:01:30 -07:00
commit 0c75f26a74
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cluster/gce/configure-vm.sh
View File

@ -83,10 +83,18 @@ for k,v in yaml.load(sys.stdin).iteritems():
} }
function remove-docker-artifacts() { function remove-docker-artifacts() {
echo "== Deleting docker0 =="
# Forcibly install bridge-utils (options borrowed from Salt logs).
until apt-get -q -y -o DPkg::Options::=--force-confold -o DPkg::Options::=--force-confdef install bridge-utils; do
echo "== install of bridge-utils failed, retrying =="
sleep 5
done
# Remove docker artifacts on minion nodes, if present # Remove docker artifacts on minion nodes, if present
iptables -t nat -F || true iptables -t nat -F || true
ifconfig docker0 down || true ifconfig docker0 down || true
brctl delbr docker0 || true brctl delbr docker0 || true
echo "== Finished deleting docker0 =="
} }
# Retry a download until we get it. # Retry a download until we get it.
@ -152,6 +160,9 @@ EOF
done done
rm /usr/sbin/policy-rc.d rm /usr/sbin/policy-rc.d
# Log a timestamp
echo "== Finished installing Salt =="
} }
# Ensure salt-minion never runs # Ensure salt-minion never runs
@ -352,6 +363,7 @@ function configure-salt() {
} }
function run-salt() { function run-salt() {
echo "== Calling Salt =="
salt-call --local state.highstate || true salt-call --local state.highstate || true
} }