From ed346a6939896ef0e9dc32fec011a992c33fbb74 Mon Sep 17 00:00:00 2001 From: nikeshmahalka Date: Wed, 4 Mar 2015 14:34:42 +0530 Subject: [PATCH] Two choices for iscsi_helper is missing In the cinder/volume/driver.py, scstadmin and ietadm were missing from the choices for iscsi_helper. This will cause SCST and IET target helper functionality to not work properly. Change-Id: Ia455e61384d283a47f796466615139361ac9e83e Closes-Bug: #1428034 --- cinder/volume/driver.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index b697c087e..a92d14734 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -95,11 +95,13 @@ volume_opts = [ 'for example "-c3" for idle only priority.'), cfg.StrOpt('iscsi_helper', default='tgtadm', - choices=['tgtadm', 'lioadm', 'iseradm', 'iscsictl', 'fake'], + choices=['tgtadm', 'lioadm', 'scstadmin', 'iseradm', 'iscsictl', + 'ietadm', 'fake'], help='iSCSI target user-land tool to use. tgtadm is default, ' - 'use lioadm for LIO iSCSI support, iseradm for the ISER ' - 'protocol, iscsictl for Chelsio iSCSI Target or fake for ' - 'testing.'), + 'use lioadm for LIO iSCSI support, scstadmin for SCST ' + 'target support, iseradm for the ISER protocol, ietadm ' + 'for iSCSI Enterprise Target, iscsictl for Chelsio iSCSI ' + 'Target or fake for testing.'), cfg.StrOpt('volumes_dir', default='$state_path/volumes', help='Volume configuration file storage ' -- 2.45.2