summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-17 21:43:15 +0000
committerGerrit Code Review <review@openstack.org>2016-10-17 21:43:15 +0000
commit5e3ec1b42faf7dc49722b58829b6c2cf5c15da79 (patch)
tree9e6df361bd66090f73f4d00b9e21eae32755f2f8 /openstackclient
parented8e918519dd52d7aff4d8f8665a4e94348c8686 (diff)
parent694a24c3093f5b2595b63ccf988da7972e532084 (diff)
downloadpython-openstackclient-5e3ec1b42faf7dc49722b58829b6c2cf5c15da79.tar.gz
Merge "Fix --shared/block-migration options in server migrate command"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 1ca31497..df46c7df 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -973,15 +973,15 @@ class MigrateServer(command.Command):
migration_group = parser.add_mutually_exclusive_group()
migration_group.add_argument(
'--shared-migration',
- dest='shared_migration',
- action='store_true',
- default=True,
+ dest='block_migration',
+ action='store_false',
+ default=False,
help=_('Perform a shared live migration (default)'),
)
migration_group.add_argument(
'--block-migration',
- dest='shared_migration',
- action='store_false',
+ dest='block_migration',
+ action='store_true',
help=_('Perform a block live migration'),
)
disk_group = parser.add_mutually_exclusive_group()
@@ -1016,9 +1016,9 @@ class MigrateServer(command.Command):
)
if parsed_args.live:
server.live_migrate(
- parsed_args.live,
- parsed_args.shared_migration,
- parsed_args.disk_overcommit,
+ host=parsed_args.live,
+ block_migration=parsed_args.block_migration,
+ disk_over_commit=parsed_args.disk_overcommit,
)
else:
server.migrate()