diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py index 497fb0342cb7..b545c09e3b94 100644 --- a/nova/conf/libvirt.py +++ b/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, )) diff --git a/nova/virt/libvirt/volume/iser.py b/nova/virt/libvirt/volume/iser.py index 38e37b8532ab..820f849e1a3c 100644 --- a/nova/virt/libvirt/volume/iser.py +++ b/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.register_opts(volume_opts, 'libvirt') +CONF = nova.conf.CONF class LibvirtISERVolumeDriver(iscsi.LibvirtISCSIVolumeDriver): diff --git a/nova/virt/opts.py b/nova/virt/opts.py index ec1d55226e0c..a1fc36c52c62 100644 --- a/nova/virt/opts.py +++ b/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,