Merge "Move config option definition"

This commit is contained in:
Zuul 2019-04-24 11:31:32 +00:00 committed by Gerrit Code Review
commit 4e240836f5
2 changed files with 6 additions and 8 deletions

View File

@ -61,6 +61,12 @@ hyperv_opts = [
"pending tasks. In some situations, the destroy "
"operation will fail (e.g. due to file locks), "
"requiring subsequent retries."),
cfg.BoolOpt('move_disks_on_cold_migration',
default=True,
help="Move the instance files to the instance dir configured "
"on the destination host. You may consider disabling "
"this when using multiple CSVs or shares and you wish "
"the source location to be preserved."),
]
coordination_opts = [

View File

@ -25,7 +25,6 @@ from nova import exception
from nova.virt import configdrive
from nova.virt import driver
from os_win import utilsfactory
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import units
@ -41,13 +40,6 @@ from compute_hyperv.nova import volumeops
LOG = logging.getLogger(__name__)
CONF = nova.conf.CONF
hyperv_migration_opts = [
cfg.BoolOpt('move_disks_on_cold_migration',
default=True)
]
CONF.register_opts(hyperv_migration_opts, 'hyperv')
class MigrationOps(object):