From dacadc2afd4b5675833987ca507ac16dae55996e Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Tue, 9 May 2017 12:14:38 +0200 Subject: [PATCH] Fix rexray systemd unit * remove existing rexray containers in ExecStartPre * set volume tag to rshared * fix indentation Closes-Bug: #1686421 Change-Id: I71ffd708baac0403dae7d8f38a073240c44e0434 (cherry picked from commit ad94578a2f5d3dd7fb6bad57cc7c741227ed5c30) --- .../swarm/fragments/volume-service.sh | 25 ++++++++++++------- 1 file 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 47522e4c52..814e482252 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 [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]