summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-07-08 14:50:52 -0500
committerJosh Kearney <josh@jk0.org>2011-07-08 14:50:52 -0500
commit93fe8b7844561f3872aa5afa5e85e7baf25f3ff4 (patch)
treec50a8ffd3dd72467db44a94503ef8e1eb0a3ab44
parent9b9ed7a688236292d89298026450ed6fd631d017 (diff)
downloadnova-93fe8b7844561f3872aa5afa5e85e7baf25f3ff4.tar.gz
nova-93fe8b7844561f3872aa5afa5e85e7baf25f3ff4.tar.xz
nova-93fe8b7844561f3872aa5afa5e85e7baf25f3ff4.zip
Updated resize docstring.
-rw-r--r--nova/compute/api.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 5e024f0ac..edd1a4d64 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -856,7 +856,12 @@ class API(base.Base):
{'host': migration_ref['dest_compute'], })
def resize(self, context, instance_id, flavor_id=None):
- """Resize a running instance."""
+ """Resize (ie, migrate) a running instance.
+
+ If flavor_id is None, the process is considered a migration, keeping
+ the original flavor_id. If flavor_id is not None, the instance should
+ be migrated to a new host and resized to the new flavor_id.
+ """
instance = self.db.instance_get(context, instance_id)
current_instance_type = instance['instance_type']