openstack/magnum
Code Issues Proposed changes

Merge "Upgrade to Swarm 0.4.0 (latest)"

Browse Source
This commit is contained in:
Jenkins 2015-10-13 22:47:26 +00:00 committed by Gerrit Code Review
commit 5af3705fb6
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/dev/dev-quickstart.rst
View File

@ -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:: address 8.8.8.8 four times::
magnum container-create --name test-container \ magnum container-create --name test-container \
--image cirros \ --image docker.io/cirros:latest \
--bay swarmbay \ --bay swarmbay \
--command "ping -c 4 8.8.8.8" --command "ping -c 4 8.8.8.8"

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

@ -15,9 +15,8 @@ write_files:
TimeoutStartSec=0 TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill swarm-agent ExecStartPre=-/usr/bin/docker kill swarm-agent
ExecStartPre=-/usr/bin/docker rm swarm-agent ExecStartPre=-/usr/bin/docker rm swarm-agent
ExecStartPre=-/usr/bin/docker pull swarm:0.2.0 ExecStartPre=-/usr/bin/docker pull swarm:0.4.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.4.0 join --addr $NODE_IP:2375 $DISCOVERY_URL
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
ExecStop=/usr/bin/docker stop swarm-agent ExecStop=/usr/bin/docker stop swarm-agent
ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \ ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \
--data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \ --data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \

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

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