diff options
| -rw-r--r-- | nova/config.py | 7 | ||||
| -rw-r--r-- | nova/virt/driver.py | 7 | ||||
| -rw-r--r-- | nova/virt/hyperv/livemigrationops.py | 2 | ||||
| -rw-r--r-- | nova/virt/hyperv/vmops.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/nova/config.py b/nova/config.py index 95d897255..172e772ae 100644 --- a/nova/config.py +++ b/nova/config.py @@ -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) diff --git a/nova/virt/driver.py b/nova/virt/driver.py index a3fe68586..2c495e5e0 100644 --- a/nova/virt/driver.py +++ b/nova/virt/driver.py @@ -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 diff --git a/nova/virt/hyperv/livemigrationops.py b/nova/virt/hyperv/livemigrationops.py index de98dd8b2..232cbd660 100644 --- a/nova/virt/hyperv/livemigrationops.py +++ b/nova/virt/hyperv/livemigrationops.py @@ -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): diff --git a/nova/virt/hyperv/vmops.py b/nova/virt/hyperv/vmops.py index 2c3253685..43c6e6af5 100644 --- a/nova/virt/hyperv/vmops.py +++ b/nova/virt/hyperv/vmops.py @@ -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): diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 4a642922a..b79a2ba92 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -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') diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index adb43a743..add3536de 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -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 = { |