From 8d76d4ee5763751b35f6a76dffb1a125e471c89d Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Mon, 22 Jun 2015 23:12:34 -0700 Subject: [PATCH] Make master-addon service depend on both docker and kubelet service in salt. --- cluster/saltbase/salt/kube-master-addons/init.sls | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cluster/saltbase/salt/kube-master-addons/init.sls b/cluster/saltbase/salt/kube-master-addons/init.sls index 91186052205..94286345dee 100644 --- a/cluster/saltbase/salt/kube-master-addons/init.sls +++ b/cluster/saltbase/salt/kube-master-addons/init.sls @@ -37,10 +37,19 @@ master-docker-image-tags: file.touch: - name: /srv/pillar/docker-images.sls +# Current containervm image by default has both docker and kubelet +# running. But during cluster creation stage, docker and kubelet +# could be overwritten completely, or restarted due flag changes. +# The ordering of salt states for service docker, kubelet and +# master-addon below is very important to avoid the race between +# salt restart docker or kubelet and kubelet start master components. kube-master-addons: service.running: - enable: True - restart: True + - require: + - service: docker + - service: kubelet - watch: - file: master-docker-image-tags - file: /etc/kubernetes/kube-master-addons.sh