summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Fehlig <jfehlig@suse.com>2012-07-25 14:15:12 -0600
committerJim Fehlig <jfehlig@suse.com>2012-07-25 22:34:50 -0600
commit1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe (patch)
treec4da49e49d66c7eff5de193e455c705404631c8b
parent1ba504464d8202ab6d93c5a081e03a8a1e63ba95 (diff)
downloadnova-1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe.tar.gz
nova-1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe.tar.xz
nova-1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe.zip
Include architecture in instance base options passed to the scheduler
Commit 31336b35 removed architecture from the instance base_options passed to _schedule_run_instance(). The architecture specified in the image is needed by a subsequent patch to the ComputeFilter which filters compute hosts against the triple (architecture, hypervisor_type, vm_mode). Change-Id: I840356979e51de3a6d941fe4ae9610e488383a44
-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