Move common virt driver options to virt.driver
The default_ephemeral_format and use_cow_images options are used by a number of virt drivers and nowhere else. blueprint: scope-config-opts Change-Id: I4ab2891e156589ae7bb44e6ce69cba3680a070c5
This commit is contained in:
parent
44cc0cda04
commit
1db4b13d86
|
@ -66,19 +66,12 @@ global_opts = [
|
|||
cfg.ListOpt('memcached_servers',
|
||||
default=None,
|
||||
help='Memcached servers or None for in process cache.'),
|
||||
cfg.StrOpt('default_ephemeral_format',
|
||||
default=None,
|
||||
help='The default format an ephemeral_volume will be '
|
||||
'formatted with on creation.'),
|
||||
cfg.BoolOpt('use_ipv6',
|
||||
default=False,
|
||||
help='use ipv6'),
|
||||
cfg.IntOpt('service_down_time',
|
||||
default=60,
|
||||
help='maximum time since last check-in for up service'),
|
||||
cfg.BoolOpt('use_cow_images',
|
||||
default=True,
|
||||
help='Whether to use cow images'),
|
||||
]
|
||||
|
||||
cfg.CONF.register_opts(global_opts)
|
||||
|
|
|
@ -35,6 +35,13 @@ driver_opts = [
|
|||
'include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, '
|
||||
'fake.FakeDriver, baremetal.BareMetalDriver, '
|
||||
'vmwareapi.VMWareESXDriver'),
|
||||
cfg.StrOpt('default_ephemeral_format',
|
||||
default=None,
|
||||
help='The default format an ephemeral_volume will be '
|
||||
'formatted with on creation.'),
|
||||
cfg.BoolOpt('use_cow_images',
|
||||
default=True,
|
||||
help='Whether to use cow images'),
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
|
|
@ -35,7 +35,7 @@ if sys.platform == 'win32':
|
|||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = cfg.CONF
|
||||
CONF.import_opt('use_cow_images', 'nova.config')
|
||||
CONF.import_opt('use_cow_images', 'nova.virt.driver')
|
||||
|
||||
|
||||
class LiveMigrationOps(baseops.BaseOps):
|
||||
|
|
|
@ -58,7 +58,7 @@ hyperv_opts = [
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(hyperv_opts)
|
||||
CONF.import_opt('use_cow_images', 'nova.config')
|
||||
CONF.import_opt('use_cow_images', 'nova.virt.driver')
|
||||
|
||||
|
||||
class VMOps(baseops.BaseOps):
|
||||
|
|
|
@ -190,10 +190,10 @@ libvirt_opts = [
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(libvirt_opts)
|
||||
CONF.import_opt('default_ephemeral_format', 'nova.config')
|
||||
CONF.import_opt('host', 'nova.config')
|
||||
CONF.import_opt('my_ip', 'nova.config')
|
||||
CONF.import_opt('use_cow_images', 'nova.config')
|
||||
CONF.import_opt('default_ephemeral_format', 'nova.virt.driver')
|
||||
CONF.import_opt('use_cow_images', 'nova.virt.driver')
|
||||
CONF.import_opt('live_migration_retry_count', 'nova.compute.manager')
|
||||
CONF.import_opt('vncserver_proxyclient_address', 'nova.vnc')
|
||||
|
||||
|
|
|
@ -123,9 +123,9 @@ xenapi_vm_utils_opts = [
|
|||
|
||||
CONF = cfg.CONF
|
||||
CONF.register_opts(xenapi_vm_utils_opts)
|
||||
CONF.import_opt('default_ephemeral_format', 'nova.config')
|
||||
CONF.import_opt('default_ephemeral_format', 'nova.virt.driver')
|
||||
CONF.import_opt('use_cow_images', 'nova.virt.driver')
|
||||
CONF.import_opt('glance_num_retries', 'nova.image.glance')
|
||||
CONF.import_opt('use_cow_images', 'nova.config')
|
||||
CONF.import_opt('use_ipv6', 'nova.config')
|
||||
|
||||
XENAPI_POWER_STATE = {
|
||||
|
|
Loading…
Reference in New Issue