diff --git a/nova/conf/libvirt.py b/nova/conf/libvirt.py
index f9666c019a..9c4c89cd7f 100644
--- a/nova/conf/libvirt.py
+++ b/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,
 ))
 
 
diff --git a/nova/virt/libvirt/volume/aoe.py b/nova/virt/libvirt/volume/aoe.py
index 92db236401..e910f9a02e 100644
--- a/nova/virt/libvirt/volume/aoe.py
+++ b/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):
diff --git a/nova/virt/opts.py b/nova/virt/opts.py
index 2ccec9afbe..4fd735aa87 100644
--- a/nova/virt/opts.py
+++ b/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,