diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-07 00:10:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-07 00:10:25 +0000 |
| commit | 220bbcf922d5e274d9d8b2fe8beeb91f91acdeb4 (patch) | |
| tree | 285f003993b6262297e975678a96bfe5e10e8525 | |
| parent | 91f2ee518ad8e7241dd7eca183ce2107729a01dc (diff) | |
| parent | 7c4ab6820d42768ac5055ca3c8e0b272358bd43d (diff) | |
| download | nova-220bbcf922d5e274d9d8b2fe8beeb91f91acdeb4.tar.gz nova-220bbcf922d5e274d9d8b2fe8beeb91f91acdeb4.tar.xz nova-220bbcf922d5e274d9d8b2fe8beeb91f91acdeb4.zip | |
Merge "Use dict style access for image_ref."
| -rw-r--r-- | nova/virt/baremetal/driver.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py index 62fffc25b..5bbb23995 100644 --- a/nova/virt/baremetal/driver.py +++ b/nova/virt/baremetal/driver.py @@ -448,7 +448,7 @@ class BareMetalDriver(driver.ComputeDriver): inst_name = inst['name'] injection_path = basepath('root') - img_id = inst.image_ref + img_id = inst['image_ref'] for injection in ('metadata', 'key', 'net'): if locals()[injection]: diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index d6f8a7831..63d92af56 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -1406,7 +1406,7 @@ class LibvirtDriver(driver.ComputeDriver): img_id = 'config-drive' else: injection_path = image('disk').path - img_id = instance.image_ref + img_id = instance['image_ref'] for injection in ('metadata', 'key', 'net', 'admin_pass', 'files'): if locals()[injection]: |