From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 30 Oct 2014 21:44:30 +0000 (+0000)
Subject: Merge "Fix NetApp AutoSupport Shortcomings."
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5997c02f443d7666ad95ce4307fc6d8828fc2c6e;p=openstack-build%2Fcinder-build.git

Merge "Fix NetApp AutoSupport Shortcomings."
---

5997c02f443d7666ad95ce4307fc6d8828fc2c6e
diff --cc cinder/volume/drivers/netapp/iscsi.py
index c518e4e4b,6897932d2..8b966e641
--- a/cinder/volume/drivers/netapp/iscsi.py
+++ b/cinder/volume/drivers/netapp/iscsi.py
@@@ -87,10 -88,12 +88,11 @@@ class NetAppDirectISCSIDriver(driver.IS
      VERSION = "1.0.0"
  
      IGROUP_PREFIX = 'openstack-'
 -    required_flags = ['netapp_transport_type', 'netapp_login',
 -                      'netapp_password', 'netapp_server_hostname',
 -                      'netapp_server_port']
 +    required_flags = ['netapp_login', 'netapp_password',
 +                      'netapp_server_hostname']
  
      def __init__(self, *args, **kwargs):
+         self._app_version = kwargs.pop("app_version", "unknown")
          super(NetAppDirectISCSIDriver, self).__init__(*args, **kwargs)
          validate_instantiation(**kwargs)
          self.configuration.append_config_values(netapp_connection_opts)