summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2012-08-09 15:16:24 -0400
committerDan Prince <dprince@redhat.com>2012-08-09 15:36:37 -0400
commit2fa7b1aa1cecf6963655dd613fdc4395a4d74626 (patch)
tree3fa664290de8a2ff70cb67cc1bb26eae6e4aa47d
parenteb1538763450d7d0f95d4c29ff54f4bf7defaa09 (diff)
Make update_db an opt arg in scheduler manager.
Updates the scheduler manager so that update_db is an optional argument. This fixes issues when trying to make RPC calls with the most recent version (1.4) of the scheduler RPC API. Fixes LP Bug #1035004. Change-Id: Ib998c0465cead1b8e117a7344557f8ff496c7e40
-rw-r--r--nova/scheduler/manager.py4
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