conf: resolved final todos in libvirt conf

* num_iscsi_scan_tries - was renamed to num_volume_scan_tries,
  as the name was misleading. This opt was also moved to the list
  that is more appropriate for it

Change-Id: Icb73ca7e3fcde1ef9b73d2238d8c986d109e459a
Implements: bp centralize-config-options-pike

7 files changed, 19 insertions, 14 deletions

diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
index 8ee6708441..690e623408 100644
--- a/nova/conf/libvirt.py
+++ b/nova/conf/libvirt.py
@@ -736,7 +736,13 @@ Use multipath connection of the iSCSI or FC volume
 
 Volumes can be connected in the LibVirt as multipath devices. This will
 provide high availability and fault tolerance.
-""")
+"""),
+    cfg.IntOpt('num_volume_scan_tries',
+               deprecated_name='num_iscsi_scan_tries',
+               default=5,
+               help="""
+Number of times to scan given storage protocol to find volume.
+"""),
 ]
 
 libvirt_volume_aoe_opts = [
@@ -760,15 +766,7 @@ compute node.
 """)
 ]
 
-# TODO(sneti): This config option is also used for other protocols like
-# fibrechannel, scaleio, disco. So this should be renamed to
-# num_volume_scan_tries
 libvirt_volume_iscsi_opts = [
-    cfg.IntOpt('num_iscsi_scan_tries',
-               default=5,
-               help="""
-Number of times to scan iSCSI target to find volume.
-"""),
     cfg.StrOpt('iscsi_iface',
                deprecated_name='iscsi_transport',
                help="""
diff --git a/nova/virt/libvirt/volume/disco.py b/nova/virt/libvirt/volume/disco.py
index 3af2750e82..15cdfdadea 100644
--- a/nova/virt/libvirt/volume/disco.py
+++ b/nova/virt/libvirt/volume/disco.py
@@ -37,7 +37,7 @@ class LibvirtDISCOVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
                                                        is_block_dev=False)
         self.connector = connector.InitiatorConnector.factory(
             'DISCO', utils.get_root_helper(),
-            device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries)
+            device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
 
     def get_config(self, connection_info, disk_info):
         """Get DISCO volume attachment configuration."""
diff --git a/nova/virt/libvirt/volume/fibrechannel.py b/nova/virt/libvirt/volume/fibrechannel.py
index a84e7d4757..47b0744a50 100644
--- a/nova/virt/libvirt/volume/fibrechannel.py
+++ b/nova/virt/libvirt/volume/fibrechannel.py
@@ -34,7 +34,7 @@ class LibvirtFibreChannelVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
         self.connector = connector.InitiatorConnector.factory(
             'FIBRE_CHANNEL', utils.get_root_helper(),
             use_multipath=CONF.libvirt.volume_use_multipath,
-            device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries)
+            device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
 
     def get_config(self, connection_info, disk_info):
         """Returns xml for libvirt."""
diff --git a/nova/virt/libvirt/volume/hgst.py b/nova/virt/libvirt/volume/hgst.py
index e5df5bea01..05c65afb04 100644
--- a/nova/virt/libvirt/volume/hgst.py
+++ b/nova/virt/libvirt/volume/hgst.py
@@ -30,7 +30,7 @@ class LibvirtHGSTVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
               self).__init__(host, is_block_dev=True)
         self.connector = connector.InitiatorConnector.factory(
             'HGST', utils.get_root_helper(),
-            device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries)
+            device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
 
     def get_config(self, connection_info, disk_info):
         """Returns xml for libvirt."""
diff --git a/nova/virt/libvirt/volume/iscsi.py b/nova/virt/libvirt/volume/iscsi.py
index 1bd9a3c825..278a5e80d6 100644
--- a/nova/virt/libvirt/volume/iscsi.py
+++ b/nova/virt/libvirt/volume/iscsi.py
@@ -37,7 +37,7 @@ class LibvirtISCSIVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
         self.connector = connector.InitiatorConnector.factory(
             'ISCSI', utils.get_root_helper(),
             use_multipath=CONF.libvirt.volume_use_multipath,
-            device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries,
+            device_scan_attempts=CONF.libvirt.num_volume_scan_tries,
             transport=self._get_transport())
 
     def _get_transport(self):
diff --git a/nova/virt/libvirt/volume/scaleio.py b/nova/virt/libvirt/volume/scaleio.py
index b97152eb05..a5fc0c308c 100644
--- a/nova/virt/libvirt/volume/scaleio.py
+++ b/nova/virt/libvirt/volume/scaleio.py
@@ -38,7 +38,7 @@ class LibvirtScaleIOVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
                                                          is_block_dev=False)
         self.connector = connector.InitiatorConnector.factory(
             'SCALEIO', utils.get_root_helper(),
-            device_scan_attempts=CONF.libvirt.num_iscsi_scan_tries)
+            device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
 
     def get_config(self, connection_info, disk_info):
         conf = super(LibvirtScaleIOVolumeDriver, self).get_config(
diff --git a/releasenotes/notes/rename-libvirt-num-iscsi-scan-tries-opt-8329385f84d2518e.yaml b/releasenotes/notes/rename-libvirt-num-iscsi-scan-tries-opt-8329385f84d2518e.yaml
new file mode 100644
index 0000000000..cd896b365c
--- /dev/null
+++ b/releasenotes/notes/rename-libvirt-num-iscsi-scan-tries-opt-8329385f84d2518e.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    ``libvirt.num_iscsi_scan_tries`` option has been renamed to
+    ``libvirt.num_volume_scan_tries``, as the previous name was suggesting
+    that this option only concerns devices connected using iSCSI interface.
+    It also concerns devices connected using fibrechannel, scaleio and disco.
\ No newline at end of file