From 720e5af1e08cc829e98db10da4b93795771a927e Mon Sep 17 00:00:00 2001 From: "Walter A. Boring IV" Date: Fri, 17 Jun 2016 14:35:18 -0700 Subject: [PATCH] config option: rename libvirt iscsi_use_multipath This patch renames the libvirt conf section entry of iscsi_use_multipath to volume_use_multipath. Both iSCSI and FibreChannel libvirt volume drivers use this value to determine if multipath volume attachments are to be used. It's an n-cpu system wide value that's not specific to iSCSI. Change-Id: Iebbac91a74df468d5be9b2e70560d5b4394ce595 Closes-Bug: #1593860 --- nova/conf/libvirt.py | 7 ++++--- nova/virt/libvirt/driver.py | 2 +- nova/virt/libvirt/volume/fibrechannel.py | 2 +- nova/virt/libvirt/volume/iscsi.py | 2 +- .../notes/rename-iscsi-multipath-opt-eabbafccd2b74a0a.yaml | 4 ++++ 5 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 releasenotes/notes/rename-iscsi-multipath-opt-eabbafccd2b74a0a.yaml diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 89f785f037..59b8e426d7 100644 --- a/nova/conf/libvirt.py +++ b/nova/conf/libvirt.py @@ -377,6 +377,10 @@ libvirt_volume_opts = [ default=[], help='Protocols listed here will be accessed directly ' 'from QEMU. Currently supported protocols: [gluster]'), + cfg.BoolOpt('volume_use_multipath', + default=False, + help='Use multipath connection of the iSCSI or FC volume', + deprecated_name='iscsi_use_multipath'), ] libvirt_volume_aoe_opts = [ @@ -396,9 +400,6 @@ libvirt_volume_iscsi_opts = [ cfg.IntOpt('num_iscsi_scan_tries', default=5, help='Number of times to rescan iSCSI target to find volume'), - cfg.BoolOpt('iscsi_use_multipath', - default=False, - help='Use multipath connection of the iSCSI or FC volume'), cfg.StrOpt('iscsi_iface', deprecated_name='iscsi_transport', help='The iSCSI transport iface to use to connect to target in ' diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 8d01350cf1..c18c32f187 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1109,7 +1109,7 @@ class LibvirtDriver(driver.ComputeDriver): root_helper = utils.get_root_helper() return connector.get_connector_properties( root_helper, CONF.my_block_storage_ip, - CONF.libvirt.iscsi_use_multipath, + CONF.libvirt.volume_use_multipath, enforce_multipath=True, host=CONF.host) diff --git a/nova/virt/libvirt/volume/fibrechannel.py b/nova/virt/libvirt/volume/fibrechannel.py index 7f600b117e..376ffb2adf 100644 --- a/nova/virt/libvirt/volume/fibrechannel.py +++ b/nova/virt/libvirt/volume/fibrechannel.py @@ -33,7 +33,7 @@ class LibvirtFibreChannelVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver): # more than x86 architectures. self.connector = connector.InitiatorConnector.factory( 'FIBRE_CHANNEL', utils.get_root_helper(), - use_multipath=CONF.libvirt.iscsi_use_multipath, + use_multipath=CONF.libvirt.volume_use_multipath, device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries) def get_config(self, connection_info, disk_info): diff --git a/nova/virt/libvirt/volume/iscsi.py b/nova/virt/libvirt/volume/iscsi.py index cbd644707b..18d66ee394 100644 --- a/nova/virt/libvirt/volume/iscsi.py +++ b/nova/virt/libvirt/volume/iscsi.py @@ -36,7 +36,7 @@ class LibvirtISCSIVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver): # more than x86 architectures. self.connector = connector.InitiatorConnector.factory( 'ISCSI', utils.get_root_helper(), - use_multipath=CONF.libvirt.iscsi_use_multipath, + use_multipath=CONF.libvirt.volume_use_multipath, device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries, transport=self._get_transport()) diff --git a/releasenotes/notes/rename-iscsi-multipath-opt-eabbafccd2b74a0a.yaml b/releasenotes/notes/rename-iscsi-multipath-opt-eabbafccd2b74a0a.yaml new file mode 100644 index 0000000000..19b1a4b2ee --- /dev/null +++ b/releasenotes/notes/rename-iscsi-multipath-opt-eabbafccd2b74a0a.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - The libvirt option 'iscsi_use_multipath' has been renamed to + 'volume_use_multipath'.