Config options: centralize iser libvirt options (11)

The config options of the "nova.conf" section "libvirt" got
moved to the new central location "nova/conf/libvirt.py".
Subsequent patches will then move another options in libvirt section.
This is the 11th patch in a long-chain patchs.

Change-Id: I879d668f95f507ca193fad2d21a9465c3b3a2062
Co-Authored-by: Markus Zoeller <mzoeller@de.ibm.com>
Implements: blueprint centralize-config-options-newton

nova/conf/libvirt.py

@@ -334,6 +334,15 @@ libvirt_volume_iscsi_opts = [
     # instead
 ]
 
+libvirt_volume_iser_opts = [
+    cfg.IntOpt('num_iser_scan_tries',
+               default=5,
+               help='Number of times to rescan iSER target to find volume'),
+    cfg.BoolOpt('iser_use_multipath',
+                default=False,
+                help='Use multipath connection of the iSER volume'),
+]
+
 ALL_OPTS = list(itertools.chain(
     libvirt_general_opts,
     libvirt_imagebackend_opts,
@@ -345,6 +354,7 @@ ALL_OPTS = list(itertools.chain(
     libvirt_volume_aoe_opts,
     libvirt_volume_glusterfs_opts,
     libvirt_volume_iscsi_opts,
+    libvirt_volume_iser_opts,
 ))
 
 

nova/virt/libvirt/volume/iser.py

@@ -11,22 +11,13 @@
 #    under the License.
 
 from os_brick.initiator import connector
-from oslo_config import cfg
 
+import nova.conf
 from nova import utils
 from nova.virt.libvirt.volume import iscsi
 
-volume_opts = [
-    cfg.IntOpt('num_iser_scan_tries',
-               default=5,
-               help='Number of times to rescan iSER target to find volume'),
-    cfg.BoolOpt('iser_use_multipath',
-                default=False,
-                help='Use multipath connection of the iSER volume'),
-    ]
 
-CONF = cfg.CONF
+CONF = nova.conf.CONF
-CONF.register_opts(volume_opts, 'libvirt')
 
 
 class LibvirtISERVolumeDriver(iscsi.LibvirtISCSIVolumeDriver):

nova/virt/opts.py

@@ -12,7 +12,6 @@
 
 import itertools
 
-import nova.virt.libvirt.volume.iser
 import nova.virt.libvirt.volume.net
 import nova.virt.libvirt.volume.nfs
 import nova.virt.libvirt.volume.quobyte
@@ -30,7 +29,6 @@ def list_opts():
     return [
         ('libvirt',
          itertools.chain(
-             nova.virt.libvirt.volume.iser.volume_opts,
              nova.virt.libvirt.volume.net.volume_opts,
              nova.virt.libvirt.volume.nfs.volume_opts,
              nova.virt.libvirt.volume.quobyte.volume_opts,