From 6ea308295a158b4700f4081913f66596fc769b36 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 11 Jan 2013 14:30:23 -0500 Subject: Fix some conductor manager return values. A couple of methods in the compute manager were returning a db model as the result of an rpc.call(). Since db models all contain non-primitive types, this will cause failures in the rpc layer. Related to bp no-db-compute. Change-Id: I6e4af99bd75e4a367bdc83b969ed4d8252f69ba2 --- nova/conductor/manager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'nova') diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index fb583d0ce..a7bc08420 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -266,7 +266,9 @@ class ConductorManager(manager.SchedulerDependentManager): return jsonutils.to_primitive(result) def action_event_start(self, context, values): - return self.db.action_event_start(context, values) + evt = self.db.action_event_start(context, values) + return jsonutils.to_primitive(evt) def action_event_finish(self, context, values): - return self.db.action_event_finish(context, values) + evt = self.db.action_event_finish(context, values) + return jsonutils.to_primitive(evt) -- cgit