Revision 7ed85ffe
| b/lib/hypervisor/hv_xen.py | ||
|---|---|---|
| 306 | 306 |
return "'xm info' failed: %s, %s" % (result.fail_reason, result.output) |
| 307 | 307 |
|
| 308 | 308 |
@staticmethod |
| 309 |
def _GetConfigFileDiskData(disk_template, block_devices):
|
|
| 309 |
def _GetConfigFileDiskData(block_devices): |
|
| 310 | 310 |
"""Get disk directive for xen config file. |
| 311 | 311 |
|
| 312 | 312 |
This method builds the xen config disk directive according to the |
| 313 | 313 |
given disk_template and block_devices. |
| 314 | 314 |
|
| 315 |
@param disk_template: string containing instance disk template |
|
| 316 | 315 |
@param block_devices: list of tuples (cfdev, rldev): |
| 317 | 316 |
- cfdev: dict containing ganeti config disk part |
| 318 | 317 |
- rldev: ganeti.bdev.BlockDev object |
| ... | ... | |
| 503 | 502 |
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: |
| 504 | 503 |
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] |
| 505 | 504 |
|
| 505 |
disk_data = cls._GetConfigFileDiskData(block_devices) |
|
| 506 |
|
|
| 506 | 507 |
config.write("vif = [%s]\n" % ",".join(vif_data))
|
| 507 |
config.write("disk = [%s]\n" % ",".join(
|
|
| 508 |
cls._GetConfigFileDiskData(instance.disk_template, |
|
| 509 |
block_devices))) |
|
| 508 |
config.write("disk = [%s]\n" % ",".join(disk_data))
|
|
| 510 | 509 |
|
| 511 | 510 |
config.write("root = '%s'\n" % hvp[constants.HV_ROOT_PATH])
|
| 512 | 511 |
config.write("on_poweroff = 'destroy'\n")
|
| ... | ... | |
| 632 | 631 |
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] |
| 633 | 632 |
|
| 634 | 633 |
config.write("vif = [%s]\n" % ",".join(vif_data))
|
| 635 |
disk_data = cls._GetConfigFileDiskData(instance.disk_template, |
|
| 636 |
block_devices) |
|
| 634 |
disk_data = cls._GetConfigFileDiskData(block_devices) |
|
| 637 | 635 |
disk_type = hvp[constants.HV_DISK_TYPE] |
| 638 | 636 |
if disk_type in (None, constants.HT_DISK_IOEMU): |
| 639 | 637 |
replacement = ",ioemu:hd" |
Also available in: Unified diff