diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-04 18:25:40 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-04 18:25:40 -0600 |
| commit | 9052bef412208c5b8fe2d658766d050e7e6307e2 (patch) | |
| tree | b62bce4d04c1302ff0c5e90136d853e4440cdb1c /nova/compute | |
| parent | 5b240fe5d963e195525c42bf097d79b3f003c8d4 (diff) | |
| parent | dd1e36b9690a2c2de18c565c496b25295a13d0aa (diff) | |
merged changes from trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/compute/manager.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 4a18c3d7d..76a571d61 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -73,6 +73,7 @@ class ComputeAPI(base.Base): max_count=1, kernel_id=None, ramdisk_id=None, display_name='', description='', key_name=None, key_data=None, security_group='default', + availability_zone=None, user_data=None, generate_hostname=generate_default_hostname): """Create the number of instances requested if quote and @@ -140,7 +141,8 @@ class ComputeAPI(base.Base): 'display_description': description, 'user_data': user_data or '', 'key_name': key_name, - 'key_data': key_data} + 'key_data': key_data, + 'availability_zone': availability_zone} elevated = context.elevated() instances = [] diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2c5ad65ae..6f4d14589 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -360,6 +360,7 @@ class ComputeManager(manager.Manager): instance_ref["internal_id"]) return self.driver.get_diagnostics(instance_ref) + @exception.wrap_exception def suspend_instance(self, context, instance_id): """suspend the instance with instance_id""" context = context.elevated() |