diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-14 21:15:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-14 21:15:36 +0000 |
| commit | 66a8721c4319d971ea9ca1dc0de285c195f244df (patch) | |
| tree | 0e3a6b37dea6644f94d381088a1faed77d0359e1 | |
| parent | 46683d34db0045a45f8d16e2c255282f289c8901 (diff) | |
| parent | 702beca2a55e70ea014e92dd91784859a2698510 (diff) | |
Merge "Fixes an iSCSI connector issue in the Hyper-V driver."
| -rw-r--r-- | nova/virt/hyperv/basevolumeutils.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nova/virt/hyperv/basevolumeutils.py b/nova/virt/hyperv/basevolumeutils.py index 32221843f..7437bf52f 100644 --- a/nova/virt/hyperv/basevolumeutils.py +++ b/nova/virt/hyperv/basevolumeutils.py @@ -28,15 +28,11 @@ if sys.platform == 'win32': import _winreg import wmi -from oslo.config import cfg - from nova import block_device from nova.openstack.common import log as logging from nova.virt import driver LOG = logging.getLogger(__name__) -CONF = cfg.CONF -CONF.import_opt('my_ip', 'nova.netconf') class BaseVolumeUtils(object): @@ -76,10 +72,7 @@ class BaseVolumeUtils(object): "Choosing the default one")) computer_system = self._conn_cimv2.Win32_ComputerSystem()[0] initiator_name = "iqn.1991-05.com.microsoft:" + hostname.lower() - return { - 'ip': CONF.my_ip, - 'initiator': initiator_name, - } + return initiator_name def volume_in_mapping(self, mount_device, block_device_info): block_device_list = [block_device.strip_dev(vol['mount_device']) |