From 702beca2a55e70ea014e92dd91784859a2698510 Mon Sep 17 00:00:00 2001 From: Pedro Navarro Perez Date: Tue, 12 Mar 2013 03:37:41 -0700 Subject: Fixes an iSCSI connector issue in the Hyper-V driver. It fixes how Hyper-v nova driver is returning iscsi connection information. It affects the way cinder plugins used that information to implement ACL based on initiator_name. Fixes: bug #1153975 Change-Id: I40dc3bba9c9a76585ba9bdd938043d4bfef195c8 --- nova/virt/hyperv/basevolumeutils.py | 9 +-------- 1 file changed, 1 insertion(+), 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']) -- cgit