summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Scherbakov <mihgen@gmail.com>2011-05-11 03:24:02 +0400
committerMike Scherbakov <mihgen@gmail.com>2011-05-11 03:24:02 +0400
commit6c4059f20c85e9bc013a340de167151e7b5fa8c4 (patch)
treecdd1f214201e104ef54368d5e1b0035ec6fb050d
parent21f18f77e7d729107742fa9157b531ce56f3272a (diff)
Bugfix #780784. KeyError when creating custom image.
-rw-r--r--Authors1
-rw-r--r--nova/virt/libvirt_conn.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/Authors b/Authors
index 60e1d2dad..72eb0b6ae 100644
--- a/Authors
+++ b/Authors
@@ -54,6 +54,7 @@ Mark Washenberger <mark.washenberger@rackspace.com>
Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com>
Michael Gundlach <michael.gundlach@rackspace.com>
+Mike Scherbakov <mihgen@gmail.com>
Monsyne Dragon <mdragon@rackspace.com>
Monty Taylor <mordred@inaugust.com>
MORITA Kazutaka <morita.kazutaka@gmail.com>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 9780c69a6..71cedae54 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -456,7 +456,8 @@ class LibvirtConnection(driver.ComputeDriver):
'container_format': base['container_format'],
'is_public': False,
'name': '%s.%s' % (base['name'], image_id),
- 'properties': {'architecture': base['architecture'],
+ 'properties': {'architecture':
+ base['properties']['architecture'],
'kernel_id': instance['kernel_id'],
'image_location': 'snapshot',
'image_state': 'available',