From 4810b8615d2076d8dda6e251ad1cf5564969266a Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Wed, 18 Dec 2019 14:11:10 +0000 Subject: [PATCH] [k8s] Enable services before starting them In the event that master/minion instances restart before the heat container agent bootstrapping is complete, it is safer to enable all the services before starting them so that they can restore normal function after reboot. story: 2007031 task: 37835 Change-Id: Ic5c7851d6603d23e554b2df88b5deefb30dd74b9 Signed-off-by: Bharat Kunwar (cherry picked from commit 7d81ae186a929346e6bc784cd12e66489a554191) --- .../kubernetes/fragments/enable-services-master.sh | 9 +++++---- .../kubernetes/fragments/enable-services-minion.sh | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh index 126a40faf3..f3b41fa837 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-master.sh @@ -16,10 +16,11 @@ while [ ! -f /etc/kubernetes/certs/ca.key ] && \ done echo "starting services" -for service in etcd docker kube-apiserver kube-controller-manager kube-scheduler kubelet kube-proxy; do - echo "activating service $service" - $ssh_cmd systemctl enable $service - $ssh_cmd systemctl restart $service +for action in enable restart; do + for service in etcd docker kube-apiserver kube-controller-manager kube-scheduler kubelet kube-proxy; do + echo "$action service $service" + $ssh_cmd systemctl $action $service + done done # Label self as master diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh index 62979a436b..1dc37e5f48 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-services-minion.sh @@ -13,8 +13,9 @@ $ssh_cmd systemctl stop docker # make sure we pick up any modified unit files $ssh_cmd systemctl daemon-reload -for service in docker kubelet kube-proxy; do - echo "activating service $service" - $ssh_cmd systemctl enable $service - $ssh_cmd systemctl start $service +for action in enable restart; do + for service in docker kubelet kube-proxy; do + echo "$action service $service" + $ssh_cmd systemctl $action $service + done done