From c4de05e7c755870cb8447cc3005c67b59fe9f6b2 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 8 Nov 2012 22:54:04 +0000 Subject: Remove volume.driver and volume.iscsi Remaining flags moved to nova.virt.libvirt.volume Part of bp delete-nova-volume Change-Id: I1b96c773f0b5df73b04215a4afb350a5583b0101 --- nova/virt/libvirt/volume.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'nova/virt') diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 03c335fa0..66ffc2efa 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -23,6 +23,7 @@ import time from nova import config from nova import exception from nova import flags +from nova.openstack.common import cfg from nova.openstack.common import lockutils from nova.openstack.common import log as logging from nova import utils @@ -30,8 +31,22 @@ from nova.virt.libvirt import config as vconfig from nova.virt.libvirt import utils as virtutils LOG = logging.getLogger(__name__) + +volume_opts = [ + cfg.IntOpt('num_iscsi_scan_tries', + default=3, + help='number of times to rescan iSCSI target to find volume'), + cfg.StrOpt('rbd_user', + default=None, + help='the RADOS client name for accessing rbd volumes'), + cfg.StrOpt('rbd_secret_uuid', + default=None, + help='the libvirt uuid of the secret for the rbd_user' + 'volumes') + ] + CONF = config.CONF -CONF.import_opt('num_iscsi_scan_tries', 'nova.volume.driver') +CONF.register_opts(volume_opts) class LibvirtVolumeDriver(object): -- cgit