diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-17 19:21:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-17 19:21:24 +0000 |
| commit | c405e776bc582667ac2d4acf66824d4aa5eb867c (patch) | |
| tree | b414ec5b39b38c5db0c8334b0b398346dd2f959b /nova/virt | |
| parent | 60e3ac6cc4eadfe07d6310fb41021d46dbace8d7 (diff) | |
| parent | 3e6eaa1f1960522c8a89403719c842c2cc23074b (diff) | |
Merge "Fix use of libvirt_disk_prefix"
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/blockinfo.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/virt/libvirt/blockinfo.py b/nova/virt/libvirt/blockinfo.py index 88f97a271..fc39fc99d 100644 --- a/nova/virt/libvirt/blockinfo.py +++ b/nova/virt/libvirt/blockinfo.py @@ -65,6 +65,8 @@ variables / types used """ +from oslo.config import cfg + from nova import block_device from nova.compute import instance_types from nova import exception @@ -75,6 +77,8 @@ from nova.virt import driver LOG = logging.getLogger(__name__) +CONF = cfg.CONF + def has_disk_dev(mapping, disk_dev): """Determine if a disk device name has already been used. @@ -103,6 +107,8 @@ def get_dev_prefix_for_disk_bus(disk_bus): Returns the dev prefix or raises an exception if the disk bus is unknown.""" + if CONF.libvirt_disk_prefix: + return CONF.libvirt_disk_prefix if disk_bus == "ide": return "hd" elif disk_bus == "virtio": |