openstack
/
magnum
Code Issues Proposed changes

Make swarm work with atomic image 

The docker swarm latest image need docker engine 1.6.0 above.
Our atomic image is old which integrated with 1.5.0.
Usually we'd like a new image with docker 1.6.0, but fedora 21 docker
package seems have issue with docker 1.6.0 check bug in:
https://github.com/docker/swarm/issues/781

In order to not block our magnum work, we'd like to bind to
swarm 0.2.0, as that image worked.If fedora 21 image can work
with docker 1.6.0, we would upgrade our new image. So it is
a workaround here.

Closes-Bug: #1466817
Change-Id: I048da03ca64a57bffb3b2872009855110fe45bd5
This commit is contained in:
Kai Qiang Wu(Kennan) 2015-06-24 07:00:09 +00:00
parent e1440c8e09
commit df42db512e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,8 +14,9 @@ write_files:
TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill swarm-agent
ExecStartPre=-/usr/bin/docker rm swarm-agent
ExecStartPre=/usr/bin/docker pull swarm
ExecStart=/usr/bin/docker run --name swarm-agent swarm join --addr $NODE_IP:2375 $DISCOVERY_URL
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 --name swarm-agent swarm:0.2.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"}' \

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

@ -14,8 +14,9 @@ write_files:
TimeoutStartSec=0
ExecStartPre=-/usr/bin/docker kill swarm-manager
ExecStartPre=-/usr/bin/docker rm swarm-manager
ExecStartPre=/usr/bin/docker pull swarm
ExecStart=/usr/bin/docker run --name swarm-manager -p 2376:2375 swarm manage -H tcp://0.0.0.0:2375 $DISCOVERY_URL
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 --name swarm-manager -p 2376:2375 swarm:0.2.0 manage -H tcp://0.0.0.0:2375 $DISCOVERY_URL
ExecStop=/usr/bin/docker stop swarm-manager
ExecStartPost=/usr/bin/curl -sf -X PUT -H 'Content-Type: application/json' \
--data-binary '{"Status": "SUCCESS", "Reason": "Setup complete", "Data": "OK", "UniqueId": "00000"}' \