openstack
/
magnum
Code Issues Proposed changes

Merge "Restart swarm infra containers if deleted"

This commit is contained in:
Jenkins 2016-11-10 08:14:26 +00:00 committed by Gerrit Code Review
parent b21551c2ba 490deb256e
commit ee68ef6d85
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
View File

@ -26,6 +26,7 @@ ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY \\
join \\ join \\
--addr $myip:2375 \\ --addr $myip:2375 \\
etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/ etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/
Restart=always
ExecStop=/usr/bin/docker stop swarm-agent ExecStop=/usr/bin/docker stop swarm-agent
ExecStartPost=/usr/local/bin/notify-heat ExecStartPost=/usr/local/bin/notify-heat

1
magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
View File

@ -39,6 +39,7 @@ fi
cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM cat >> /etc/systemd/system/swarm-manager.service << END_SERVICE_BOTTOM
etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/ etcd://$ETCD_SERVER_IP:2379/v2/keys/swarm/
ExecStop=/usr/bin/docker stop swarm-manager 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' \\ 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"}'"'" \\ --data-binary "'"'{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}'"'" \\
"$WAIT_HANDLE_ENDPOINT" "$WAIT_HANDLE_ENDPOINT"