summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorRick Harris <rconradharris@gmail.com>2012-01-17 08:18:36 +0000
committerRick Harris <rconradharris@gmail.com>2012-01-17 15:00:08 -0600
commit1357caea7955a558e309acbfff304eea73b16893 (patch)
treec8f23c17be59276f40421b4e55b0d901d53a2bfa /nova/compute
parent8c1e0022028a454f536ff211aa200cab9b0111aa (diff)
Rebuild/Resize support for disk-config.
Fixes bug 917306 Change-Id: I27848a4503a5027b0e5f9cad3f110ea67c462327
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index a75d5c027..23bb4de82 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1346,7 +1346,7 @@ class API(base.Base):
@check_instance_state(vm_state=[vm_states.ACTIVE, vm_states.SHUTOFF],
task_state=[None])
@scheduler_api.reroute_compute("resize")
- def resize(self, context, instance, flavor_id=None):
+ def resize(self, context, instance, flavor_id=None, **kwargs):
"""Resize (ie, migrate) a running instance.
If flavor_id is None, the process is considered a migration, keeping
@@ -1379,7 +1379,8 @@ class API(base.Base):
self.update(context,
instance,
vm_state=vm_states.RESIZING,
- task_state=task_states.RESIZE_PREP)
+ task_state=task_states.RESIZE_PREP,
+ **kwargs)
request_spec = {
'instance_type': new_instance_type,