From 012696943a446b352ac1a5e4992034e75fb33ba0 Mon Sep 17 00:00:00 2001 From: M V P Nitesh Date: Mon, 29 May 2017 11:38:44 +0530 Subject: [PATCH] Fix rexray systemd unit * remove existing rexray containers in ExecStartPre * set volume tag to rshared * fix indentation Change-Id: Id832e012b734f8601dfcdeb80687283e75c87f65 Closes-Bug: #1686421 --- .../templates/fragments/volume-service.sh | 25 ++++++++++++------- 1 file 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 cc39ff8b11..814e482252 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 [Service] RemainAfterExit=yes +ExecStartPre=-/usr/bin/docker rm -f rexray ExecStartPre=-/usr/bin/docker pull openstackmagnum/rexray:alpine -ExecStart=/usr/bin/rm -f /var/run/rexray/rexray.pid && \ - /usr/bin/docker run -d --name=rexray --privileged -p 7979:7979 \ - -v /run/docker/plugins:/run/docker/plugins \ - -v /var/lib/rexray:/var/lib/rexray:z \ - -v /var/log/rexray:/var/log/rexray \ - -v /var/run/rexray:/var/run/rexray \ - -v /dev:/dev \ - -v /etc/rexray/config.yml:/etc/rexray/config.yml \ - openstackmagnum/rexray:alpine +ExecStartPre=-/usr/bin/rm -f /var/run/rexray/rexray.pid +ExecStart=/usr/bin/docker run -d --name=rexray --privileged \\ +--pid host \\ +--net host \\ +-p 7979:7979 \\ +-v /run/docker/plugins:/run/docker/plugins \\ +-v /var/lib/rexray:/var/lib/rexray:Z \\ +-v /var/lib/libstorage:/var/lib/libstorage:rshared \\ +-v /var/log/rexray:/var/log/rexray \\ +-v /var/run/rexray:/var/run/rexray \\ +-v /var/lib/docker:/var/lib/docker:rshared \\ +-v /var/run/docker:/var/run/docker \\ +-v /dev:/dev \\ +-v /etc/rexray/config.yml:/etc/rexray/config.yml \\ +openstackmagnum/rexray:alpine ExecStop=/usr/bin/docker stop rexray [Install]