From 490deb256ee3bfac6e7292f3de07775a16c25df2 Mon Sep 17 00:00:00 2001 From: Vijendar Komalla Date: Tue, 8 Nov 2016 15:49:41 -0600 Subject: [PATCH] Restart swarm infra containers if deleted Currently a user can accidentally delete swarm infra conatiners (swarm-manager, swarm-agent). This change is to restart infra containers if they were deleted/killed. Change-Id: I4640dfb3dbb4bb6684da86998424936d3128eade Closes-Bug: #1640312 --- .../templates/swarm/fragments/write-swarm-agent-service.sh | 1 + .../templates/swarm/fragments/write-swarm-master-service.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh index 11ff07f625..6abf5d6470 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh @@ -26,6 +26,7 @@ ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\ join \\ --addr $myip:2375 \\ etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/ +Restart=always ExecStop=/usr/bin/docker stop swarm-agent ExecStartPost=/usr/local/bin/notify-heat diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh index 47626bac5b..6aa6a8423e 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh @@ -39,6 +39,7 @@ fi cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/ ExecStop=/usr/bin/docker stop swarm-manager +Restart=always ExecStartPost=/usr/bin/curl -k -i -X POST -H 'Content-Type: application/json' -H 'X-Auth-Token: $WAIT_HANDLE_TOKEN' \\ --data-binary "'"'{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}'"'" \\ "$WAIT_HANDLE_ENDPOINT"