From 25e2467edc6325d05f5752579a0917b64eb42c04 Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Fri, 14 Dec 2018 16:16:50 +0100
Subject: [PATCH] Mounting the whole of /dev/now in cinder-storage

---
 roles/cinder-storage/tasks/main.yml                   | 3 ++-
 roles/cinder-storage/templates/cinder-storage.service | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/roles/cinder-storage/tasks/main.yml b/roles/cinder-storage/tasks/main.yml
index e023f11..51a8183 100644
--- a/roles/cinder-storage/tasks/main.yml
+++ b/roles/cinder-storage/tasks/main.yml
@@ -22,6 +22,7 @@
         -e "RABBIT_PASSWORD={{ secrets['RABBIT_PASSWORD'] }}"
         -e "AVAILABILITY_ZONE={{ ansible_nodename }}"
         -e "RABBIT_USER=openstack"
+        -e "CINDER_STORAGE_VOLUME={{ storage_volume }}"
   tags: vars
 
 - name: pull docker image
@@ -44,7 +45,7 @@
              --privileged
              {{ env_vars }}
              -v /srv/cinder-storage/root:/root \
-             -v "{{ storage_volume }}":/dev/cinder_storage_volume \
+             -v /dev:/dev \
              {{ docker_image }} /etc/bootstrap.sh
   tags: bootstrap
 
diff --git a/roles/cinder-storage/templates/cinder-storage.service b/roles/cinder-storage/templates/cinder-storage.service
index 9e4dde1..bc1cf42 100644
--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@@ -11,10 +11,8 @@ ExecStartPre=-/usr/bin/docker rm %n
 ExecStart=/usr/bin/docker run --name %n \
   --privileged \
   {{ env_vars | replace('\n', '') }} \
-  -v "/dev/cinder-volumes/":/dev/cinder-volumes \
   -v /srv/cinder-storage/root:/root \
-  -v "{{ storage_volume }}":/dev/cinder_storage_volume \
-  -v "/dev/lvm":/dev/lvm \
+  -v "/dev":/dev \
   -v "/srv/cinder-storage/volumes/:/var/lib/cinder/volumes/" \
   --network=host \
   {{ docker_image }}