diff --git a/README b/README
index 49edd85..ec5b849 100644
--- a/README
+++ b/README
@@ -83,6 +83,15 @@
 
 service nova-compute restart
 
+fallocate -l 10G /lvm.img
+losetup /dev/loop0 /lvm.img
+echo -e '#!/bin/bash\nlosetup /dev/loop0 /lvm.img' > /etc/rc.local
+pvcreate /dev/loop0
+vgcreate cinder-volume /dev/loop0
+
+salt-call state.apply cinder
+
+
 . /root/keystonercv3
 
 wget http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
@@ -94,3 +103,6 @@
 nova flavor-create m1.extra_tiny auto 256 0 1
 
 nova boot --flavor m1.extra_tiny --image cirros --nic net-id=d23f9845-cbce-47a6-be15-0603f6a31365 test # UUID of internal network
+
+cinder create --name test 1
+nova volume-attach test 49a471ec-2e6d-4810-9161-6c191e1370f5 # UUID of volume
diff --git a/classes/cluster/virtual-mcp-allinone/init.yml b/classes/cluster/virtual-mcp-allinone/init.yml
index 417adc6..abca1cd 100755
--- a/classes/cluster/virtual-mcp-allinone/init.yml
+++ b/classes/cluster/virtual-mcp-allinone/init.yml
@@ -36,6 +36,12 @@
         members:
         - host: 127.0.0.1
           port: 11211
+  cinder:
+    volume:
+      cache:
+        members:
+        - host: 127.0.0.1
+          port: 11211
   rabbitmq:
     server:
       host:
diff --git a/classes/cluster/virtual-mcp-allinone/openstack/init.yml b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
index ffbfc46..d85f4e9 100755
--- a/classes/cluster/virtual-mcp-allinone/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
@@ -9,6 +9,7 @@
 - system.mysql.client.database.glance
 - system.mysql.client.database.nova
 - system.mysql.client.database.nova_api
+- system.mysql.client.database.cinder
 - system.keystone.client.single
 - system.keystone.client.service.nova
 - system.keystone.client.service.nova-placement
@@ -17,6 +18,10 @@
 - system.neutron.control.single
 - system.nova.compute.single
 - service.neutron.gateway.single
+- system.cinder.control.single
+- system.cinder.control.backend.lvm
+- service.cinder.volume.single
+- system.cinder.volume.backend.lvm
 parameters:
   _param:
     openstack_version: ocata
@@ -29,6 +34,7 @@
     glance_version: ${_param:openstack_version}
     nova_version: ${_param:openstack_version}
     neutron_version: ${_param:openstack_version}
+    cinder_version: ${_param:openstack_version}
     keystone_service_token: workshop
     keystone_admin_password: workshop
     keystone_ceilometer_password: workshop
@@ -42,6 +48,7 @@
     mysql_glance_password: workshop
     mysql_nova_password: workshop
     mysql_neutron_password: workshop
+    mysql_cinder_password: workshop
     heat_service_host: ${_param:single_address}
     neutron_service_host: ${_param:single_address}
     glance_service_host: ${_param:single_address}
@@ -50,6 +57,7 @@
     control_address: ${_param:single_address}
     metadata_password: workshop
     cluster_vip_address: ${_param:single_address}
+    cluster_local_address: ${_param:single_address}
     tenant_address: ${_param:single_address}
   keystone:
     server:
@@ -97,3 +105,10 @@
   rabbitmq:
     server:
       host: ~
+  cinder:
+    controller:
+      message_queue:
+        virtual_host: openstack
+    volume:
+      cache:
+        members: ~