Merge "Fix --shared/block-migration options in server migrate command"
This commit is contained in:
commit
5e3ec1b42f
@ -973,15 +973,15 @@ class MigrateServer(command.Command):
|
|||||||
migration_group = parser.add_mutually_exclusive_group()
|
migration_group = parser.add_mutually_exclusive_group()
|
||||||
migration_group.add_argument(
|
migration_group.add_argument(
|
||||||
'--shared-migration',
|
'--shared-migration',
|
||||||
dest='shared_migration',
|
dest='block_migration',
|
||||||
action='store_true',
|
action='store_false',
|
||||||
default=True,
|
default=False,
|
||||||
help=_('Perform a shared live migration (default)'),
|
help=_('Perform a shared live migration (default)'),
|
||||||
)
|
)
|
||||||
migration_group.add_argument(
|
migration_group.add_argument(
|
||||||
'--block-migration',
|
'--block-migration',
|
||||||
dest='shared_migration',
|
dest='block_migration',
|
||||||
action='store_false',
|
action='store_true',
|
||||||
help=_('Perform a block live migration'),
|
help=_('Perform a block live migration'),
|
||||||
)
|
)
|
||||||
disk_group = parser.add_mutually_exclusive_group()
|
disk_group = parser.add_mutually_exclusive_group()
|
||||||
@ -1016,9 +1016,9 @@ class MigrateServer(command.Command):
|
|||||||
)
|
)
|
||||||
if parsed_args.live:
|
if parsed_args.live:
|
||||||
server.live_migrate(
|
server.live_migrate(
|
||||||
parsed_args.live,
|
host=parsed_args.live,
|
||||||
parsed_args.shared_migration,
|
block_migration=parsed_args.block_migration,
|
||||||
parsed_args.disk_overcommit,
|
disk_over_commit=parsed_args.disk_overcommit,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
server.migrate()
|
server.migrate()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user