From b75fab3e814e49020ded9ebd0f26116d8ea416b7 Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Tue, 18 Dec 2018 11:08:04 +0100
Subject: [PATCH] Added openstack01 with /dev mounted in cinder container.

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

diff --git a/openstack03 b/openstack03
index 204477e..060a1ad 100644
--- a/openstack03
+++ b/openstack03
@@ -27,11 +27,13 @@ openstack03
 
 [cinder-storage]
 openstack01 storage_volume=/dev/sdc3
+openstack02 storage_volume=/dev/sda5
 openstack03 storage_volume=/dev/sdb1
 openstack04 storage_volume=/dev/sdb1
 
 [nova-compute]
 openstack01 physical_interface_mappings=provider:bond0
+openstack02 physical_interface_mappings=provider:enp34s0f1
 openstack03 physical_interface_mappings=provider:enp4s0f0
 openstack04 physical_interface_mappings=provider:eno1
 
diff --git a/roles/cinder-storage/templates/cinder-storage.service b/roles/cinder-storage/templates/cinder-storage.service
index bc1cf42..5feab79 100644
--- a/roles/cinder-storage/templates/cinder-storage.service
+++ b/roles/cinder-storage/templates/cinder-storage.service
@@ -13,7 +13,7 @@ ExecStart=/usr/bin/docker run --name %n \
   {{ env_vars | replace('\n', '') }} \
   -v /srv/cinder-storage/root:/root \
   -v "/dev":/dev \
-  -v "/srv/cinder-storage/volumes/:/var/lib/cinder/volumes/" \
+  -v "/var/lib/cinder:/var/lib/cinder" \
   --network=host \
   {{ docker_image }}
 
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index f2ed302..f0a88eb 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -26,7 +26,7 @@
     owner: root
     group: root
 
-- import_tasks: docker.yml
+    #- import_tasks: docker.yml
 
 
 - name: Log into DockerHub