summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoren Hansen <soren@linux2go.dk>2011-03-03 16:33:18 +0100
committerSoren Hansen <soren@linux2go.dk>2011-03-03 16:33:18 +0100
commit86b86bc6da2b550f4e61574edb9437e05dc094e3 (patch)
treeb93a9a64b9fb029acfe39436ab12e11b453e76a2
parentc50bb69ce92e9d03b153a334d82fd6917764889d (diff)
parent90e8072df434621a364763f1c7cae0ac0159d630 (diff)
downloadnova-86b86bc6da2b550f4e61574edb9437e05dc094e3.tar.gz
nova-86b86bc6da2b550f4e61574edb9437e05dc094e3.tar.xz
nova-86b86bc6da2b550f4e61574edb9437e05dc094e3.zip
Merge trunk
-rw-r--r--nova/virt/libvirt_conn.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 00750e096..b900cb8eb 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -604,7 +604,7 @@ class LibvirtConnection(object):
user=user,
project=project,
size=size)
- type_data = instance_types.get_instance_type([inst['instance_type']])
+ type_data = instance_types.get_instance_type(inst['instance_type'])
if type_data['local_gb']:
self._cache_image(fn=self._create_local,