summaryrefslogtreecommitdiffstats
path: root/nova/scheduler/manager.py
diff options
context:
space:
mode:
authorRussell Bryant <rbryant@redhat.com>2013-02-18 20:07:47 -0500
committerRussell Bryant <rbryant@redhat.com>2013-02-18 20:07:47 -0500
commitb01c266c5d0250197147f276d5edf7215e6fb510 (patch)
tree5e52ef6241ca54f44d5db6deae4ea2cccf10e16b /nova/scheduler/manager.py
parent20f1a991cb949218b9e7d33d08afa6fdbefb298b (diff)
downloadnova-b01c266c5d0250197147f276d5edf7215e6fb510.tar.gz
nova-b01c266c5d0250197147f276d5edf7215e6fb510.tar.xz
nova-b01c266c5d0250197147f276d5edf7215e6fb510.zip
Ensure rpc result is primitive types.
This new rpc method was not ensuring that the result was converted to primitive types. This would cause it to break when using an rpc backend other than impl_kombu. Change-Id: I0a21b559d12ff7d0c96341fcec887b2436753eda
Diffstat (limited to 'nova/scheduler/manager.py')
-rw-r--r--nova/scheduler/manager.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 176d1f014..6b47f37f8 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -36,6 +36,7 @@ from nova import notifications
from nova.openstack.common import cfg
from nova.openstack.common import excutils
from nova.openstack.common import importutils
+from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
from nova.openstack.common.notifier import api as notifier
from nova import quota
@@ -291,4 +292,4 @@ class SchedulerManager(manager.Manager):
filter_properties"""
hosts = self.driver.select_hosts(context, request_spec,
filter_properties)
- return hosts
+ return jsonutils.to_primitive(hosts)