diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-20 02:31:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-20 02:31:13 +0000 |
| commit | 9f4030e6e2cc883bf99c46a146bc8248e0a0fff4 (patch) | |
| tree | 142752cdb0cdb18a5bec82f9b139715bf0f4dba7 | |
| parent | 616d7d7e5308c876df970abacb874b541b16482e (diff) | |
| parent | f6584a6f22be3f7a0c089901d417293046905989 (diff) | |
| download | nova-9f4030e6e2cc883bf99c46a146bc8248e0a0fff4.tar.gz nova-9f4030e6e2cc883bf99c46a146bc8248e0a0fff4.tar.xz nova-9f4030e6e2cc883bf99c46a146bc8248e0a0fff4.zip | |
Merge "Converts scheduler.utils.build_request_spec return to json primitive"
| -rw-r--r-- | nova/scheduler/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/scheduler/utils.py b/nova/scheduler/utils.py index d17ab89b2..028c72ff7 100644 --- a/nova/scheduler/utils.py +++ b/nova/scheduler/utils.py @@ -24,10 +24,10 @@ def build_request_spec(image, instances): The request_spec assumes that all instances to be scheduled are the same type. """ - instance = jsonutils.to_primitive(instances[0]) + instance = instances[0] request_spec = { 'image': image, 'instance_properties': instance, 'instance_type': flavors.extract_flavor(instance), 'instance_uuids': [inst['uuid'] for inst in instances]} - return request_spec + return jsonutils.to_primitive(request_spec) |