summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorhill <yuyuehill@gmail.com>2013-01-06 11:29:41 +0800
committerhill <yuyuehill@gmail.com>2013-01-06 14:43:22 +0800
commite8746dbcc1ad53a3335d063fea95b516a0f10f9d (patch)
tree0b418ff5066ae723b876ff595c5b1fb0a0b80a0f /nova/api
parent9279e0052f300eb0f64d63c970d34c050d744906 (diff)
config_drive is missing in xml deserializer
bug 1096508 Change-Id: Ibaca0b08b866fa6297d8abaf005adbc6f689818c
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 7a8d7d5a8..f992dc445 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -223,6 +223,10 @@ class CommonDeserializer(wsgi.MetadataXMLDeserializer):
if auto_disk_config:
server['OS-DCF:diskConfig'] = utils.bool_from_str(auto_disk_config)
+ config_drive = server_node.getAttribute('config_drive')
+ if config_drive:
+ server['config_drive'] = config_drive
+
return server
def _extract_block_device_mapping(self, server_node):