summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Velten <mathieu.velten@cern.ch>2017-05-09 12:14:38 +0200
committerMathieu Velten <mathieu.velten@cern.ch>2017-05-09 12:23:39 +0200
commitad94578a2f5d3dd7fb6bad57cc7c741227ed5c30 (patch)
treed031aa0f07557c3180cf5e2ef9948728f712868c
parentb27e7604e1904bcd85d386211043e8738585e729 (diff)
Fix rexray systemd unit
* remove existing rexray containers in ExecStartPre * set volume tag to rshared * fix indentation Closes-Bug: #1686421 Change-Id: I71ffd708baac0403dae7d8f38a073240c44e0434
Notes
Notes (review): Code-Review+2: Spyros Trigazis <strigazi@gmail.com> Code-Review+2: Ton Ngo <ton@us.ibm.com> Workflow+1: Ton Ngo <ton@us.ibm.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 10 May 2017 10:40:00 +0000 Reviewed-on: https://review.openstack.org/463514 Project: openstack/magnum Branch: refs/heads/master
-rw-r--r--magnum/drivers/common/templates/swarm/fragments/volume-service.sh25
1 files changed, 16 insertions, 9 deletions
diff --git a/magnum/drivers/common/templates/swarm/fragments/volume-service.sh b/magnum/drivers/common/templates/swarm/fragments/volume-service.sh
index 47522e4..814e482 100644
--- a/magnum/drivers/common/templates/swarm/fragments/volume-service.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/volume-service.sh
@@ -46,16 +46,23 @@ After=docker.service
46 46
47[Service] 47[Service]
48RemainAfterExit=yes 48RemainAfterExit=yes
49ExecStartPre=-/usr/bin/docker rm -f rexray
49ExecStartPre=-/usr/bin/docker pull openstackmagnum/rexray:alpine 50ExecStartPre=-/usr/bin/docker pull openstackmagnum/rexray:alpine
50ExecStart=/usr/bin/rm -f /var/run/rexray/rexray.pid && \ 51ExecStartPre=-/usr/bin/rm -f /var/run/rexray/rexray.pid
51 /usr/bin/docker run -d --name=rexray --privileged -p 7979:7979 \ 52ExecStart=/usr/bin/docker run -d --name=rexray --privileged \\
52 -v /run/docker/plugins:/run/docker/plugins \ 53--pid host \\
53 -v /var/lib/rexray:/var/lib/rexray:z \ 54--net host \\
54 -v /var/log/rexray:/var/log/rexray \ 55-p 7979:7979 \\
55 -v /var/run/rexray:/var/run/rexray \ 56-v /run/docker/plugins:/run/docker/plugins \\
56 -v /dev:/dev \ 57-v /var/lib/rexray:/var/lib/rexray:Z \\
57 -v /etc/rexray/config.yml:/etc/rexray/config.yml \ 58-v /var/lib/libstorage:/var/lib/libstorage:rshared \\
58 openstackmagnum/rexray:alpine 59-v /var/log/rexray:/var/log/rexray \\
60-v /var/run/rexray:/var/run/rexray \\
61-v /var/lib/docker:/var/lib/docker:rshared \\
62-v /var/run/docker:/var/run/docker \\
63-v /dev:/dev \\
64-v /etc/rexray/config.yml:/etc/rexray/config.yml \\
65openstackmagnum/rexray:alpine
59ExecStop=/usr/bin/docker stop rexray 66ExecStop=/usr/bin/docker stop rexray
60 67
61[Install] 68[Install]