Merge "Upgrade to Swarm 0.4.0 (latest)"
This commit is contained in:
commit
5af3705fb6
@ -417,7 +417,7 @@ Next we will create a container in this bay. This container will ping the
|
||||
address 8.8.8.8 four times::
|
||||
|
||||
magnum container-create --name test-container \
|
||||
--image cirros \
|
||||
--image docker.io/cirros:latest \
|
||||
--bay swarmbay \
|
||||
--command "ping -c 4 8.8.8.8"
|
||||
|
||||
|
@ -15,9 +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.2.0
|
||||
#TODO: roll-back from swarm:0.2.0 to swarm if atomic image can work with latest swarm image
|
||||
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.2.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
|
||||
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
|
||||
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"}' \
|
||||
|
@ -11,15 +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.2.0
|
||||
#TODO: roll-back from swarm:0.2.0 to swarm if atomic image can work with latest swarm image
|
||||
ExecStartPre=-/usr/bin/docker pull swarm:0.4.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.2.0 \\
|
||||
swarm:0.4.0 \\
|
||||
manage -H tcp://0.0.0.0:2375 \\
|
||||
END_SERVICE_TOP
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user