From 1759d5825c8207492c8960711130d9eb85e5d631 Mon Sep 17 00:00:00 2001 From: Christopher Yeoh Date: Fri, 8 Mar 2013 14:55:54 +1100 Subject: Fix OS-DCF:diskconfig XML handling Removes string to bool conversion for the OS-DCF:diskconfig attribute during XML deserialising as the diskconfig extension expects a string (MANUAL or AUTO) not a bool. Fixes bug 1152439 Change-Id: Id9a5c2559a2891c2a21c437c9a5a534b9885c9bf --- nova/api/openstack/compute/servers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 3464cfdbd..9055d0ae1 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -215,11 +215,11 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer): # anyone that might be using it. auto_disk_config = server_node.getAttribute('auto_disk_config') if auto_disk_config: - server['OS-DCF:diskConfig'] = utils.bool_from_str(auto_disk_config) + server['OS-DCF:diskConfig'] = auto_disk_config auto_disk_config = server_node.getAttribute('OS-DCF:diskConfig') if auto_disk_config: - server['OS-DCF:diskConfig'] = utils.bool_from_str(auto_disk_config) + server['OS-DCF:diskConfig'] = auto_disk_config config_drive = server_node.getAttribute('config_drive') if config_drive: -- cgit