From 05087612b99379c9b9bc7ff90db9b823695719d4 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Thu, 14 Jan 2016 12:41:33 -0800 Subject: [PATCH] salt: Try 'systemctl' if 'service' command fails when restarting docker. --- .../saltbase/salt/kube-master-addons/kube-master-addons.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh b/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh index ba9905d768d..4041e8f21f7 100755 --- a/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh +++ b/cluster/saltbase/salt/kube-master-addons/kube-master-addons.sh @@ -51,7 +51,11 @@ while true; do if [[ $loadedImageFlags == 7 ]]; then break; fi # Sometimes docker load hang, restart docker daemon resolve the issue - if [[ $restart_docker ]]; then service docker restart; fi + if [[ $restart_docker ]]; then + if ! service docker restart; then # Try systemctl if there's no service command. + systemctl restart docker + fi + fi # sleep for 15 seconds before attempting to load docker images again sleep 15