Config options: centralize aoe vol libvirt options (8)

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 8th patch in a long-chain patchs.

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

nova/conf/libvirt.py

@@ -297,6 +297,12 @@ libvirt_volume_opts = [
                      'from QEMU. Currently supported protocols: [gluster]'),
 ]
 
+libvirt_volume_aoe_opts = [
+    cfg.IntOpt('num_aoe_discover_tries',
+               default=3,
+               help='Number of times to rediscover AoE target to find volume'),
+]
+
 ALL_OPTS = list(itertools.chain(
     libvirt_general_opts,
     libvirt_imagebackend_opts,
@@ -305,6 +311,7 @@ ALL_OPTS = list(itertools.chain(
     libvirt_utils_opts,
     libvirt_vif_opts,
     libvirt_volume_opts,
+    libvirt_volume_aoe_opts,
 ))
 
 

nova/virt/libvirt/volume/aoe.py

@@ -11,22 +11,15 @@
 #    under the License.
 
 from os_brick.initiator import connector
-from oslo_config import cfg
 from oslo_log import log as logging
 
+import nova.conf
 from nova import utils
 from nova.virt.libvirt.volume import volume as libvirt_volume
 
 LOG = logging.getLogger(__name__)
 
-volume_opts = [
-    cfg.IntOpt('num_aoe_discover_tries',
-               default=3,
-               help='Number of times to rediscover AoE target to find volume'),
-    ]
-
-CONF = cfg.CONF
-CONF.register_opts(volume_opts, 'libvirt')
+CONF = nova.conf.CONF
 
 
 class LibvirtAOEVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):

nova/virt/opts.py

@@ -12,7 +12,6 @@
 
 import itertools
 
-import nova.virt.libvirt.volume.aoe
 import nova.virt.libvirt.volume.glusterfs
 import nova.virt.libvirt.volume.iscsi
 import nova.virt.libvirt.volume.iser
@@ -33,7 +32,6 @@ def list_opts():
     return [
         ('libvirt',
          itertools.chain(
-             nova.virt.libvirt.volume.aoe.volume_opts,
              nova.virt.libvirt.volume.glusterfs.volume_opts,
              nova.virt.libvirt.volume.iscsi.volume_opts,
              nova.virt.libvirt.volume.iser.volume_opts,