summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-08 04:58:12 +0000
committerGerrit Code Review <review@openstack.org>2013-01-08 04:58:12 +0000
commit4ac882e7d22f197f3858b3c7b112980334aaa3a0 (patch)
tree51bcc62efce415a95340fba8ab9ad29aa4486ada /nova/api
parent3a14312ae2ccccfa4f64d80e42aacb4d16a9567f (diff)
parente8746dbcc1ad53a3335d063fea95b516a0f10f9d (diff)
Merge "config_drive is missing in xml deserializer"
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):