summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-27 01:07:08 +0000
committerGerrit Code Review <review@openstack.org>2012-07-27 01:07:08 +0000
commit4f17fc93720874185dbc2742da8afa3316fd39fd (patch)
treed38c2c2990c323c3069ff618e0f8d4311f4def99
parent151017385a03b6652f28965001c893fd4d57b6fb (diff)
parent1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe (diff)
downloadnova-4f17fc93720874185dbc2742da8afa3316fd39fd.tar.gz
nova-4f17fc93720874185dbc2742da8afa3316fd39fd.tar.xz
nova-4f17fc93720874185dbc2742da8afa3316fd39fd.zip
Merge "Include architecture in instance base options passed to the scheduler"
-rw-r--r--nova/compute/api.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 0571c7313..b0f350bd3 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -331,6 +331,7 @@ class API(base.Base):
return value
options_from_image = {'os_type': prop('os_type'),
+ 'architecture': prop('arch'),
'vm_mode': prop('vm_mode')}
# If instance doesn't have auto_disk_config overridden by request, use