summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-11-27 09:26:48 -0600
committerChuck Short <chuck.short@canonical.com>2012-11-29 07:47:58 -0600
commit3930b85b9a2dd2aaa2bf006d7f126348ea6b9fdb (patch)
tree7efdaf3c64f9c822840defa13371c807b15b9834 /nova/compute
parent4b24907b679f26d976435e2dfb307db8fcfadc29 (diff)
downloadnova-3930b85b9a2dd2aaa2bf006d7f126348ea6b9fdb.tar.gz
nova-3930b85b9a2dd2aaa2bf006d7f126348ea6b9fdb.tar.xz
nova-3930b85b9a2dd2aaa2bf006d7f126348ea6b9fdb.zip
Fix typo in inherit_properties_from_image
Should be architecture rather than arch. Fixes LP: 1082547 Change-Id: I9e40b00ec05a99f11894b0e47a9cf47b20b46fe2 Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'nova/compute')
-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 79db499bd..6b358cbd5 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