diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-15 17:35:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-15 17:35:40 +0000 |
| commit | f14cd697c005f946886f90f7af8379c58e062ed1 (patch) | |
| tree | 5f7992b43577dd5bf7636d93c256593b4ab7b038 /nova/api | |
| parent | d802d807049478d1fe30dedcbcdae28f666e61b3 (diff) | |
| parent | 1759d5825c8207492c8960711130d9eb85e5d631 (diff) | |
| download | nova-f14cd697c005f946886f90f7af8379c58e062ed1.tar.gz nova-f14cd697c005f946886f90f7af8379c58e062ed1.tar.xz nova-f14cd697c005f946886f90f7af8379c58e062ed1.zip | |
Merge "Fix OS-DCF:diskconfig XML handling"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index ce40e087b..ef1ab23ca 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -222,11 +222,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: |