summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-29 17:38:17 +0000
committerGerrit Code Review <review@openstack.org>2012-11-29 17:38:17 +0000
commitb57628a7d3ffbe86be7f9a6e6da763e2aba04af5 (patch)
treedc6a641e4d0394e43f50c11e1f4a41e7d95e67c2 /nova
parentd9f02e6cedbc59dd22f1208cc9b9f30202d84db3 (diff)
parent3930b85b9a2dd2aaa2bf006d7f126348ea6b9fdb (diff)
Merge "Fix typo in inherit_properties_from_image"
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index eb3b23c29..42db85a66 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -378,7 +378,7 @@ class API(base.Base):
return value
options_from_image = {'os_type': prop('os_type'),
- 'architecture': prop('arch'),
+ 'architecture': prop('architecture'),
'vm_mode': prop('vm_mode')}
# If instance doesn't have auto_disk_config overridden by request, use