summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorDan Prince <dan.prince@rackspace.com>2012-01-21 17:31:24 -0500
committerDan Prince <dan.prince@rackspace.com>2012-01-21 17:31:24 -0500
commit255ce807236e9cdfd61357208fbb12b3453b109d (patch)
tree8542cb7725a75dc4366d3a5120f95b79ad2144d6 /nova/compute
parentae13abc51818792dcf0fc895eaad442dd41f54d2 (diff)
Allow compute manager prep_resize to accept kwargs
Fixes issues when trying to resize instances. Fixes LP bug #919642. Change-Id: I411d29404902c377088750e1ae4560b8a419d4f2
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 807150949..e80c11b84 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1115,7 +1115,7 @@ class ComputeManager(manager.SchedulerDependentManager):
@exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
@checks_instance_lock
@wrap_instance_fault
- def prep_resize(self, context, instance_uuid, instance_type_id):
+ def prep_resize(self, context, instance_uuid, instance_type_id, **kwargs):
"""Initiates the process of moving a running instance to another host.
Possibly changes the RAM and disk size in the process.