Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize live_migrate_instance

Browse Source 
https://github.com/openstack/python-novaclient/blob/
master/novaclient/v2/servers.py#L468
From nova api version 2.25(Mitaka release), the default value of
block_migration is None which is mapped to 'auto'.
So we can remove 'block_migration' from live_migrate_instance.

Change-Id: I75a581d3146824b1146e2acf5a7fbe4f8368a4e8
This commit is contained in:
licanwei
2017-10-15 20:22:13 -07:00
parent 8343f4bf46
commit bf713ac7e1
3 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
watcher/common/nova_helper.py
View File

@@ -422,8 +422,7 @@ class NovaHelper(object):
return True
def live_migrate_instance(self, instance_id, dest_hostname,
block_migration=False, retry=120):
def live_migrate_instance(self, instance_id, dest_hostname, retry=120):
"""This method does a live migration of a given instance
This method uses the Nova built-in live_migrate()
@@ -436,7 +435,6 @@ class NovaHelper(object):
:param dest_hostname: the name of the destination compute node, if
destination_node is None, nova scheduler choose
the destination host
:param block_migration: No shared storage is required.
"""
LOG.debug("Trying to live migrate instance %s " % (instance_id))
@@ -450,8 +448,9 @@ class NovaHelper(object):
LOG.debug(
"Instance %s found on host '%s'." % (instance_id, host_name))
instance.live_migrate(host=dest_hostname,
block_migration=block_migration)
# From nova api version 2.25(Mitaka release), the default value of
# block_migration is None which is mapped to 'auto'.
instance.live_migrate(host=dest_hostname)
instance = self.nova.servers.get(instance_id)