diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-01 11:35:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-01 11:35:00 +0000 |
| commit | 11764e5250dc2ea4a92cf7402271e7d4e407113f (patch) | |
| tree | a77a97e9e85df72629685920aa909b439e382a62 /nova/virt | |
| parent | 957a2a6909fb6b5d9773ef74160543f4d984cc96 (diff) | |
| parent | 2c9eba280a78e4159267d4a56a09df9076c844d3 (diff) | |
Merge "Add a 'hw_' namespace to glance hardware config properties"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/vif.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 09e3809d9..3e4b3995c 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -201,7 +201,7 @@ def get_disk_bus_for_device_type(virt_type, # Prefer a disk bus set against the image first of all if image_meta: - key = device_type + "_bus" + key = "hw_" + device_type + "_bus" disk_bus = image_meta.get('properties', {}).get(key) if disk_bus is not None: if not is_disk_bus_valid_for_virt(virt_type, disk_bus): diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index e13af6cce..68b0505aa 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -101,7 +101,8 @@ class LibvirtBaseVIFDriver(object): # If the user has specified a 'vif_model' against the # image then honour that model if image_meta: - vif_model = image_meta.get('properties', {}).get('vif_model') + vif_model = image_meta.get('properties', + {}).get('hw_vif_model') if vif_model is not None: model = vif_model |