The value of netapp_storage_protocol should default to none

[Rushil Chugh]

The value of netapp_storage_protocol was changed from 'None' to 'iscsi' in the commit https://github.com/openstack/cinder/commit/132fbcd38ebae52bdd20da54905131b75581520f . It needs to be reverted back to its original default value of 'None'.

[Rushil Chugh (rushil)]

For a cmodeNFS configuration, the pools data shows incorrectly the default value of netapp_storage_protocol to be iSCSI whereas it should fail to start when no value of netapp_storage_protocol is provided in the cinder.conf. The driver in its current state boots up and incorrectly sets the value of 'storage_protocol' to be 'iSCSI'.

DEBUG cinder.scheduler.host_manager [-] Received volume service update from ubuntu-1404@cmodeNFS: {u'pools': [{u'pool_name': u'vol_nfs', u'netapp_thick_provisioned': u'true', u'allocated_capacity_gb': 0, u'total_capacity_gb': 39.58, u'reserved_percentage': 0, u'netapp_raid_type': u'raid_dp', u'netapp_disk_type': u'SATA', u'netapp_nodedup': u'true', u'netapp_unmirrored': u'true', u'QoS_support': False, u'netapp_nocompression': u'true', u'free_capacity_gb': 39.58, u'netapp_compression': u'false', u'netapp_mirrored': u'false', u'netapp_dedup': u'false', u'netapp_thin_provisioned': u'false'}], u'driver_version': u'1.0.0', u'vendor_name': u'NetApp', u'volume_backend_name': u'NetApp_iSCSI_Cluster_direct', u'storage_protocol': u'iSCSI'}

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit 995116acf8483367b1b9cb956f24b07c7f47bd26
Author: Rushil Chugh <email address hidden>
Date: Wed Mar 18 21:00:36 2015 -0400

    The value of netapp_storage_protocol should default to none

    The value of netapp_storage_protocol was changed from 'None' to 'iscsi'
    in a recent commit. It needs to be reverted back to its correct default
    value of 'None'.

    Closes-bug: 1433842

    Change-Id: I7f7bff8d8cbd8671ee52cb9225f496ff6e679398