openstack
/
magnum
Code Issues Proposed changes

Upgrade to Swarm 1.0.0 (production ready release) 

Docker Inc announced Swarm 1.0: Production-ready release
(https://blog.docker.com/2015/11/swarm-1-0/)

Closes-Bug: #1513661
Change-Id: I128c77e687b9acf244a1149523860c9f7c32ae6a
This commit is contained in:
Egor Guz 2015-10-26 17:41:58 -07:00
parent d90bc0ef7d
commit bcbcab36b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/templates/docker-swarm/fragments/write-swarm-agent-service.yaml
View File

@ -15,8 +15,8 @@ write_files:
TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill swarm-agent
ExecStartPre=-/usr/bin/docker rm swarm-agent
ExecStartPre=-/usr/bin/docker pull swarm:0.4.0
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY -e https_proxy=$HTTPS_PROXY -e no_proxy=$NO_PROXY --name swarm-agent swarm:0.4.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
ExecStartPre=-/usr/bin/docker pull swarm:1.0.0
ExecStart=/usr/bin/docker run -e http_proxy=$HTTP_PROXY -e https_proxy=$HTTPS_PROXY -e no_proxy=$NO_PROXY --name swarm-agent swarm:1.0.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
ExecStop=/usr/bin/docker stop swarm-agent
ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \
--data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \

4
magnum/templates/docker-swarm/fragments/write-swarm-master-service.sh
View File

@ -11,14 +11,14 @@ OnFailure=swarm-manager-failure.service
TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill swarm-manager
ExecStartPre=-/usr/bin/docker rm swarm-manager
ExecStartPre=-/usr/bin/docker pull swarm:0.4.0
ExecStartPre=-/usr/bin/docker pull swarm:1.0.0
ExecStart=/usr/bin/docker run --name swarm-manager \\
-v /etc/docker:/etc/docker \\
-p 2376:2375 \\
-e http_proxy=$HTTP_PROXY \\
-e https_proxy=$HTTPS_PROXY \\
-e no_proxy=$NO_PROXY \\
swarm:0.4.0 \\
swarm:1.0.0 \\
manage -H tcp://0.0.0.0:2375 \\
END_SERVICE_TOP