storwize names
diff --git a/README.rst b/README.rst
index 1f2eed8..04bed67 100644
--- a/README.rst
+++ b/README.rst
@@ -130,32 +130,46 @@
- name: 10k_SAS
- name: 15k_SAS
-Cinder setup with IBM Storwize
+Cinder setup for IBM Storwize
.. code-block:: yaml
cinder:
- controller:
+ volume:
enabled: true
- types:
- - name: 7k2_SAS
- engine: storwize
- pool: SAS7K2
- - name: 10k_SAS
- pool: SAS10K
- engine: storwize
- - name: 15k_SAS
- pool: SAS15K
- engine: storwize
- storage:
- engine: storwize
- host: 192.168.0.1
- port: 22
- user: username
- password: pass
- connection: FC/iSCSI
- multihost: true
- multipath: true
+ 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
+ 10k_SAS:
+ engine: storwize
+ name: 10k SAS disk
+ host: 192.168.0.1
+ port: 22
+ user: username
+ password: pass
+ connection: FC/iSCSI
+ multihost: true
+ multipath: true
+ pool: SAS10K
+ 15k_SAS:
+ engine: storwize
+ host: 192.168.0.1
+ port: 22
+ user: username
+ password: pass
+ connection: FC/iSCSI
+ multihost: true
+ multipath: true
+ pool: SAS15K
Cinder setup with Hitachi VPS
diff --git a/cinder/files/backend/_storwize.conf b/cinder/files/backend/_storwize.conf
index 1f09fca..b712a50 100644
--- a/cinder/files/backend/_storwize.conf
+++ b/cinder/files/backend/_storwize.conf
@@ -1,7 +1,7 @@
[{{ backend_name }}]
volume_driver = cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver
-volume_backend_name={{ backend_name }}
+volume_backend_name={{ backend.get('name', backend_name) }}
san_ip={{ backend.host }}
san_ssh_port={{ backend.port }}
san_login={{ backend.user }}