From 1b18c82ca29e3e510ab521ae58bfcbe6b68bbffe Mon Sep 17 00:00:00 2001
From: Jim Fehlig <jfehlig@suse.com>
Date: Wed, 25 Jul 2012 14:15:12 -0600
Subject: 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
---
 nova/compute/api.py | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit