1 This internal-only patch is to prevent Cinder's SanDriver from |
|
2 attempting to use the Paramiko-based routines until the latter is |
|
3 integrated into Solaris. It also provides a specific error in the case |
|
4 where san_is_local=false is defined in the configuration and a driver |
|
5 is specified that attempts to use that configuration (which implies, |
|
6 again, an attempt to use Paramiko). |
|
7 |
|
8 --- cinder-2014.2.2/cinder/volume/drivers/san/san.py.~1~ 2015-02-05 08:03:26.000000000 -0800 |
|
9 +++ cinder-2014.2.2/cinder/volume/drivers/san/san.py 2015-04-22 00:54:38.481125902 -0700 |
|
10 @@ -29,7 +29,6 @@ from cinder.i18n import _ |
|
11 from cinder.openstack.common import excutils |
|
12 from cinder.openstack.common import log as logging |
|
13 from cinder.openstack.common import processutils |
|
14 -from cinder import ssh_utils |
|
15 from cinder import utils |
|
16 from cinder.volume import driver |
|
17 |
|
18 @@ -165,10 +164,8 @@ class SanDriver(driver.VolumeDriver): |
|
19 def check_for_setup_error(self): |
|
20 """Returns an error if prerequisites aren't met.""" |
|
21 if not self.run_local: |
|
22 - if not (self.configuration.san_password or |
|
23 - self.configuration.san_private_key): |
|
24 - raise exception.InvalidInput( |
|
25 - reason=_('Specify san_password or san_private_key')) |
|
26 + raise exception.InvalidInput( |
|
27 + reason=_("san_is_local=false is not currently supported.")) |
|
28 |
|
29 # The san_ip must always be set, because we use it for the target |
|
30 if not self.configuration.san_ip: |
|