equal
deleted
inserted
replaced
1 In-house patch to adopt EMC driver to use Solaris' iscsiadm(1M) rather |
1 In-house patch to adopt EMC driver to use Solaris' iscsiadm(1M) rather |
2 than that from Linux. Patch has not yet been submitted upstream. |
2 than that from Linux. Patch has not yet been submitted upstream. |
3 |
3 |
4 --- cinder-2013.1.4/cinder/volume/drivers/emc/emc_smis_iscsi.py.~1~ 2013-10-17 11:21:37.000000000 -0700 |
4 --- cinder-2013.2.3/cinder/volume/drivers/emc/emc_smis_iscsi.py.~1~ 2014-04-03 11:42:36.000000000 -0700 |
5 +++ cinder-2013.1.4/cinder/volume/drivers/emc/emc_smis_iscsi.py 2014-03-12 17:07:06.500560732 -0700 |
5 +++ cinder-2013.2.3/cinder/volume/drivers/emc/emc_smis_iscsi.py 2014-04-09 01:30:22.894010750 -0700 |
6 @@ -21,6 +21,7 @@ |
6 @@ -21,6 +21,8 @@ |
7 """ |
7 """ |
8 |
8 |
9 import os |
9 |
10 +import sys |
10 +import sys |
11 import time |
11 + |
12 |
|
13 from cinder import exception |
12 from cinder import exception |
14 @@ -118,13 +119,41 @@ |
13 from cinder.openstack.common import log as logging |
|
14 from cinder.volume import driver |
|
15 @@ -114,13 +116,41 @@ |
15 |
16 |
16 LOG.warn(_("ISCSI provider_location not stored, using discovery")) |
17 LOG.warn(_("ISCSI provider_location not stored, using discovery")) |
17 |
18 |
18 - (out, _err) = self._execute('iscsiadm', '-m', 'discovery', |
19 - (out, _err) = self._execute('iscsiadm', '-m', 'discovery', |
19 - '-t', 'sendtargets', '-p', |
20 - '-t', 'sendtargets', '-p', |