Merge "NetApp fix for default host type in eseries"

diff --cc cinder/tests/test_netapp_eseries_iscsi.py
Simple merge

diff --cc cinder/volume/drivers/netapp/eseries/iscsi.py
index 6b339c01891067dc81603ce1688a36b4f0738144,4f76baface39602457c31297ea31430d36c6d562..f626a4fa48ebca12e5edab50706ac7b8e48a7643
--- 1/cinder/volume/drivers/netapp/eseries/iscsi.py
--- 2/cinder/volume/drivers/netapp/eseries/iscsi.py
+++ b/cinder/volume/drivers/netapp/eseries/iscsi.py
@@@ -91,15 -109,14 +111,21 @@@ class Driver(driver.ISCSIDriver)
              if not getattr(self.configuration, flag, None):
                  msg = _('%s is not set.') % flag
                  raise exception.InvalidInput(reason=msg)
 +        if not self.configuration.use_multipath_for_image_xfer:
 +            msg = _('Production use of "%(backend)s" backend requires the '
 +                    'Cinder controller to have multipathing properly set up '
 +                    'and the configuration option "%(mpflag)s" to be set to '
 +                    '"True".') % {'backend': self._backend_name,
 +                                  'mpflag': 'use_multipath_for_image_xfer'}
 +            LOG.warning(msg)
  
      def check_for_setup_error(self):
+         self.host_type =\
+             self.HOST_TYPES.get(self.configuration.netapp_eseries_host_type,
+                                 None)
+         if not self.host_type:
+             raise exception.NetAppDriverException(
+                 _('Configured host type is not supported.'))
          self._check_storage_system()
          self._populate_system_objects()
  

diff --cc etc/cinder/cinder.conf.sample
Simple merge