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

@@ -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 '

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)
 

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):

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())
 

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'.