diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-09 20:01:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-09 20:01:20 +0000 |
| commit | c60e2e8f30ced68c24ef9af75bd429a7529f353d (patch) | |
| tree | 5d8c58e7c71a11b95855b30f7f9417275e51b2f7 | |
| parent | c35b853f0fa9d41c50dd21c858bf9ffca1318953 (diff) | |
| parent | 2fa7b1aa1cecf6963655dd613fdc4395a4d74626 (diff) | |
| download | nova-c60e2e8f30ced68c24ef9af75bd429a7529f353d.tar.gz nova-c60e2e8f30ced68c24ef9af75bd429a7529f353d.tar.xz nova-c60e2e8f30ced68c24ef9af75bd429a7529f353d.zip | |
Merge "Make update_db an opt arg in scheduler manager."
| -rw-r--r-- | nova/scheduler/manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py index aae205098..4e500b4d3 100644 --- a/nova/scheduler/manager.py +++ b/nova/scheduler/manager.py @@ -144,8 +144,8 @@ class SchedulerManager(manager.Manager): # FIXME(comstud): Remove 'update_db' in a future version. It's only # here for rpcapi backwards compatibility. - def prep_resize(self, context, image, update_db, request_spec, - filter_properties, instance=None, instance_uuid=None, + def prep_resize(self, context, image, request_spec, filter_properties, + update_db=None, instance=None, instance_uuid=None, instance_type=None, instance_type_id=None, topic=None): """Tries to call schedule_prep_resize on the driver. Sets instance vm_state to ACTIVE on NoHostFound |