choices for iscsi_helper does not contain scstadmin

[sreedhar]

In the code merged by the following review link, scstadmin was missing from the choices for iscsi_helper. This will cause SCST target helper functionality to not work properly.

https://review.openstack.org/#/c/158580/5/cinder/volume/driver.py

cfg.StrOpt('iscsi_helper',
               default='tgtadm',
               choices=['tgtadm', 'lioadm', 'iseradm', 'iscsictl', '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.'),

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/161143

[Duncan Thomas (duncan-thomas)]

Eric acknowledged the bug on a post-merge comment to the review that broken it: https://review.openstack.org/#/c/158580/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/161143
Committed: https://git.openstack.org/cgit/openstack/cinder/commit/?id=ed346a6939896ef0e9dc32fec011a992c33fbb74
Submitter: Jenkins
Branch: master

commit ed346a6939896ef0e9dc32fec011a992c33fbb74
Author: nikeshmahalka <email address hidden>
Date: Wed Mar 4 14:34:42 2015 +0530

    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