diff options
| author | MORITA Kazutaka <morita.kazutaka@gmail.com> | 2011-01-12 21:12:25 +0900 |
|---|---|---|
| committer | MORITA Kazutaka <morita.kazutaka@gmail.com> | 2011-01-12 21:12:25 +0900 |
| commit | b4600b088b61a5653be9a93a0497c9d80916c8c0 (patch) | |
| tree | 253805a127d9dfba24b99f78253e284548efe167 | |
| parent | f8272fc0b38be55d383860b6138e79a8a74965be (diff) | |
| download | nova-b4600b088b61a5653be9a93a0497c9d80916c8c0.tar.gz nova-b4600b088b61a5653be9a93a0497c9d80916c8c0.tar.xz nova-b4600b088b61a5653be9a93a0497c9d80916c8c0.zip | |
Check whether 'device_path' has ':' before splitting it
| -rw-r--r-- | nova/virt/libvirt_conn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index 51c805c2f..1ea3b0aa4 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -224,14 +224,14 @@ class LibvirtConnection(object): virt_dom = self._conn.lookupByName(instance_name) mount_device = mountpoint.rpartition("/")[2] xml = '' - (protocol, vol_name) = device_path.split(':') if device_path.startswith('/dev/'): xml = """<disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='%s'/> <target dev='%s' bus='virtio'/> </disk>""" % (device_path, mount_device) - elif vol_name != '': + elif device_path.find(':') >= 0: + (protocol, vol_name) = device_path.split(':', 1) xml = """<disk type='network' device='disk'> <driver name='qemu' type='raw'/> <source protocol='%s' name='%s'/> |