diff --git a/README.rst b/README.rst
index 4c338f4..afa04f7 100644
--- a/README.rst
+++ b/README.rst
@@ -15,6 +15,7 @@
       controller:
         enabled: true
         version: juno
+        default_volume_type: 7k2SaS
         database:
           engine: mysql
           host: 127.0.0.1
@@ -36,17 +37,24 @@
           user: openstack
           password: pwd
           virtual_host: '/openstack'
-        storage:
-          engine: file
-        types:
-        - name: 7k2_SAS
-        - name: 10k_SAS
-        - name: 15k_SAS
+        backend:
+          7k2_SAS:
+            engine: storwize
+            name: 7k2 SAS disk
+            host: 192.168.0.1
+            port: 22
+            user: username
+            password: pass
+            connection: FC/iSCSI
+            multihost: true
+            multipath: true
+            pool: SAS7K2
 
     cinder:
       volume:
         enabled: true
         version: juno
+        default_volume_type: 7k2SaS
         database:
           engine: mysql
           host: 127.0.0.1
@@ -68,12 +76,18 @@
           user: openstack
           password: pwd
           virtual_host: '/openstack'
-        storage:
-          engine: file
-        types:
-        - name: 7k2_SAS
-        - name: 10k_SAS
-        - name: 15k_SAS    
+        backend:
+          7k2_SAS:
+            engine: storwize
+            name: 7k2 SAS disk
+            host: 192.168.0.1
+            port: 22
+            user: username
+            password: pass
+            connection: FC/iSCSI
+            multihost: true
+            multipath: true
+            pool: SAS7K2
 
 Cinder setup with zeroing deleted volumes
 
@@ -102,6 +116,7 @@
       controller:
         enabled: true
         version: juno
+        default_volume_type: 7k2SaS
         database:
           engine: mysql
           host: 127.0.0.1
@@ -123,12 +138,18 @@
           user: openstack
           password: pwd
           virtual_host: '/openstack'
-        storage:
-          engine: file
-        types:
-        - name: 7k2_SAS
-        - name: 10k_SAS
-        - name: 15k_SAS
+        backend:
+          7k2_SAS:
+            engine: storwize
+            name: 7k2 SAS disk
+            host: 192.168.0.1
+            port: 22
+            user: username
+            password: pass
+            connection: FC/iSCSI
+            multihost: true
+            multipath: true
+            pool: SAS7K2
 
 Cinder setup for IBM Storwize
 
diff --git a/cinder/files/juno/cinder.conf.controller.Debian b/cinder/files/juno/cinder.conf.controller.Debian
index 7e96fb0..fa62135 100644
--- a/cinder/files/juno/cinder.conf.controller.Debian
+++ b/cinder/files/juno/cinder.conf.controller.Debian
@@ -33,7 +33,7 @@
 
 {%- if controller.backend is defined %}
 
-default_volume_type={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ controller.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}
 
diff --git a/cinder/files/juno/cinder.conf.volume.Debian b/cinder/files/juno/cinder.conf.volume.Debian
index 9356f6f..383a8f5 100644
--- a/cinder/files/juno/cinder.conf.volume.Debian
+++ b/cinder/files/juno/cinder.conf.volume.Debian
@@ -33,7 +33,7 @@
 
 {%- if volume.backend is defined %}
 
-default_volume_type={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ volume.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}
 
diff --git a/cinder/files/kilo/cinder.conf.controller.Debian b/cinder/files/kilo/cinder.conf.controller.Debian
index 85ff02a..55820a2 100644
--- a/cinder/files/kilo/cinder.conf.controller.Debian
+++ b/cinder/files/kilo/cinder.conf.controller.Debian
@@ -33,7 +33,7 @@
 
 {%- if controller.backend is defined %}
 
-default_volume_type={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ controller.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}
 
diff --git a/cinder/files/kilo/cinder.conf.volume.Debian b/cinder/files/kilo/cinder.conf.volume.Debian
index c45e876..e1706d2 100644
--- a/cinder/files/kilo/cinder.conf.volume.Debian
+++ b/cinder/files/kilo/cinder.conf.volume.Debian
@@ -33,7 +33,7 @@
 
 {%- if volume.backend is defined %}
 
-default_volume_type={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ volume.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}
 
diff --git a/cinder/files/liberty/cinder.conf.controller.Debian b/cinder/files/liberty/cinder.conf.controller.Debian
index 9e3e091..ae95e4b 100644
--- a/cinder/files/liberty/cinder.conf.controller.Debian
+++ b/cinder/files/liberty/cinder.conf.controller.Debian
@@ -33,7 +33,7 @@
 
 {%- if controller.backend is defined %}
 
-default_volume_type={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ controller.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in controller.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}
 
diff --git a/cinder/files/liberty/cinder.conf.volume.Debian b/cinder/files/liberty/cinder.conf.volume.Debian
index 474c4d1..7869a8e 100644
--- a/cinder/files/liberty/cinder.conf.volume.Debian
+++ b/cinder/files/liberty/cinder.conf.volume.Debian
@@ -33,7 +33,7 @@
 
 {%- if volume.backend is defined %}
 
-default_volume_type={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{% if loop.first %}{{ backend_name }}{% endif %}{% endfor %}
+default_volume_type={{ volume.default_volume_type }}
 
 enabled_backends={% for backend_name, backend in volume.get('backend', {}).iteritems() %}{{ backend_name }}{% if not loop.last %},{% endif %}{% endfor %}