diff -rupN cinder.old/volume/drivers/xiv_ds8k.py cinder/volume/drivers/xiv_ds8k.py
--- cinder.old/volume/drivers/xiv_ds8k.py	2014-03-06 17:16:19.399033086 +0200
+++ cinder/volume/drivers/xiv_ds8k.py	2014-03-06 17:02:25.339013233 +0200
@@ -41,6 +41,11 @@ xiv_ds8k_opts = [
         default='iscsi',
         help='Connection type to the IBM Storage Array'
         ' (fibre_channel|iscsi)'),
+    cfg.StrOpt(
+        'xiv_chap',
+        default='chap-disabled',
+        help='CHAP authentication mode, effective only for iscsi'
+        ' (chap-disabled|chap-enabled|chap-enforced)'),
 ]

 CONF = cfg.CONF
@@ -72,8 +77,8 @@ class XIVDS8KDriver(san.SanDriver):
                 "xiv_ds8k_pass": self.configuration.san_password,
                 "xiv_ds8k_address": self.configuration.san_ip,
                 "xiv_ds8k_vol_pool": self.configuration.san_clustername,
-                "xiv_ds8k_connection_type":
-                self.configuration.xiv_ds8k_connection_type
+                "xiv_ds8k_connection_type": self.configuration.xiv_ds8k_connection_type,
+                "xiv_chap": self.configuration.xiv_chap
             },
             LOG,
             exception,