diff --git a/devstack/override-defaults b/devstack/override-defaults
index 3784fb4..880daef 100644
--- a/devstack/override-defaults
+++ b/devstack/override-defaults
@@ -9,6 +9,12 @@ ENABLE_CEPH_NOVA=$(trueorfalse True ENABLE_CEPH_NOVA)
 ENABLE_CEPH_RGW=$(trueorfalse False ENABLE_CEPH_RGW)
 
 if [[ $ENABLE_CEPH_CINDER == "True" ]]; then
-    CINDER_DRIVER=${CINDER_DRIVER:-ceph}
-    CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
+    if [[ $ENABLE_CEPH_ISCSI == "True" ]]; then
+        CINDER_DRIVER=${CINDER_DRIVER:-ceph_iscsi}
+        CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph_iscsi}
+        CINDER_ISCSI_HELPER=${CINDER_ISCSI_HELPER:-lioadm}
+    else
+        CINDER_DRIVER=${CINDER_DRIVER:-ceph}
+        CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-ceph}
+    fi
 fi