diff options
| author | Russell Bryant <rbryant@redhat.com> | 2013-01-11 14:30:23 -0500 |
|---|---|---|
| committer | Russell Bryant <rbryant@redhat.com> | 2013-01-11 17:35:49 -0500 |
| commit | 6ea308295a158b4700f4081913f66596fc769b36 (patch) | |
| tree | 8d5c45598fdeba8c38a4ad1f34e7991a2f01aa69 | |
| parent | cd2008c8f7476ba28e826ad40d4db8e94045723c (diff) | |
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
| -rw-r--r-- | nova/conductor/manager.py | 6 |
1 files changed, 4 insertions, 2 deletions
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) |