diff options
| author | Artom Lifshitz <alifshit@redhat.com> | 2018-07-12 14:34:51 -0400 |
|---|---|---|
| committer | Matt Riedemann <mriedem.os@gmail.com> | 2018-10-25 16:53:26 -0400 |
| commit | 1a7aee61d98b766de64c2f31124e1e8a07193988 (patch) | |
| tree | f0082dac8c4d266151b32166ea39c71b4d1a5333 /openstackclient/compute/v2/server.py | |
| parent | 6911296c3090233a7f85a35ea87615bbee950942 (diff) | |
| download | python-openstackclient-1a7aee61d98b766de64c2f31124e1e8a07193988.tar.gz | |
Don't sent disk_over_commit if nova api > 2.24
In API microversion 2.25 Nova removed the disk_over_commit parameter
to the live migration server action. This patch makes sure that we
don't include it in our request if we're running with 2.25 or higher.
Story: #2002963
Task: #22966
Change-Id: I1bbdd33be96d82422a05982508e370237c3560f3
(cherry picked from commit d6121782d3aa6a95b883220b27a154e641b61f7f)
Diffstat (limited to 'openstackclient/compute/v2/server.py')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 6734832b..88dd7cdd 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -22,6 +22,7 @@ import logging import os import sys +from novaclient import api_versions from novaclient.v2 import servers from osc_lib.cli import parseractions from osc_lib.command import command @@ -1315,11 +1316,13 @@ class MigrateServer(command.Command): parsed_args.server, ) if parsed_args.live: - server.live_migrate( - host=parsed_args.live, - block_migration=parsed_args.block_migration, - disk_over_commit=parsed_args.disk_overcommit, - ) + kwargs = { + 'host': parsed_args.live, + 'block_migration': parsed_args.block_migration + } + if compute_client.api_version < api_versions.APIVersion('2.25'): + kwargs['disk_over_commit'] = parsed_args.disk_overcommit + server.live_migrate(**kwargs) else: if parsed_args.block_migration or parsed_args.disk_overcommit: raise exceptions.CommandError("--live must be specified if " |
