diff options
| author | Jim Fehlig <jfehlig@suse.com> | 2013-03-15 15:13:31 -0600 |
|---|---|---|
| committer | Jim Fehlig <jfehlig@suse.com> | 2013-03-15 15:13:31 -0600 |
| commit | 3e6eaa1f1960522c8a89403719c842c2cc23074b (patch) | |
| tree | 4648a8c00563f5e34ee521956aaa52dbcacf6f7a /nova/virt | |
| parent | 66a8721c4319d971ea9ca1dc0de285c195f244df (diff) | |
Fix use of libvirt_disk_prefix
The code supporting libvirt_disk_prefix was dropped during the
refactoring work in commit 7be531fe. This patch re-enables
support for this option, along with a test case to verify it.
Change-Id: I84f059e2b35d9237b799236032de5c272a03a451
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": |