summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorM V P Nitesh <m.nitesh@nectechnologies.in>2017-05-29 11:38:44 +0530
committerM V P Nitesh <m.nitesh@nectechnologies.in>2017-05-29 11:39:37 +0530
commit012696943a446b352ac1a5e4992034e75fb33ba0 (patch)
tree3ba45c8a26efb1af707b591b4ef3225ece1f66af
parent2daa902a8a7b650cac2f991f64fc960b0158fefb (diff)
Fix rexray systemd unit
* remove existing rexray containers in ExecStartPre * set volume tag to rshared * fix indentation Change-Id: Id832e012b734f8601dfcdeb80687283e75c87f65 Closes-Bug: #1686421
Notes
Notes (review): Code-Review+2: Spyros Trigazis (strigazi) <strigazi@gmail.com> Code-Review+2: Adrian Otto <aotto@aotto.com> Workflow+1: Adrian Otto <aotto@aotto.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 30 May 2017 17:36:49 +0000 Reviewed-on: https://review.openstack.org/468775 Project: openstack/magnum Branch: refs/heads/stable/newton
-rw-r--r--magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/volume-service.sh25
1 files changed, 16 insertions, 9 deletions
diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/volume-service.sh b/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/volume-service.sh
index cc39ff8..814e482 100644
--- a/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/volume-service.sh
+++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/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]