Merge branch 'baserock/pedroalvarez/openstack-v6-cinder-conf2' into baserock/openstack-v6baserock/openstack-v6

Reviewed-by: Francisco Redondo Marchena
Reviewed-by: Richard Maw

1 files changed, 4 insertions, 3 deletions

diff --git a/openstack/usr/share/openstack/cinder/cinder.conf b/openstack/usr/share/openstack/cinder/cinder.conf
index 1869de61..3f1eebfd 100644
--- a/openstack/usr/share/openstack/cinder/cinder.conf
+++ b/openstack/usr/share/openstack/cinder/cinder.conf
@@ -1026,7 +1026,7 @@ use_syslog = True
  
 # The IP address that the iSCSI daemon is listening on (string
 # value)
-#iscsi_ip_address=$my_ip
+iscsi_ip_address={{ MANAGEMENT_INTERFACE_IP_ADDRESS }}
  
 # The port that the iSCSI daemon is listening on (integer
 # value)
@@ -1040,6 +1040,7 @@ use_syslog = True
 # The backend name for a given driver implementation (string
 # value)
 #volume_backend_name=<None>
+volume_backend_name=LVM_iSCSI
  
 # Do we attach/detach volumes in cinder using multipath for
 # volume to image and image to volume transfers? (boolean
@@ -1062,7 +1063,7 @@ use_syslog = True
 # iSCSI target user-land tool to use. tgtadm is default, use
 # lioadm for LIO iSCSI support, iseradm for the ISER protocol,
 # or fake for testing. (string value)
-iscsi_helper=tgtadm
+iscsi_helper=lioadm
  
 # Volume configuration file storage directory (string value)
 volumes_dir=$state_path/volumes
@@ -2262,7 +2263,7 @@ volume_group=cinder-volumes
 #
  
 # Driver to use for volume creation (string value)
-#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
+volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver
  
 # Timeout for creating the volume to migrate to when
 # performing volume migration (seconds) (integer value)