Revision 00cd937c lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 1814 | 1814 |
(fname, to_node)) |
| 1815 | 1815 |
|
| 1816 | 1816 |
to_copy = [] |
| 1817 |
if constants.HT_XEN_HVM31 in self.cfg.GetClusterInfo().enabled_hypervisors:
|
|
| 1817 |
if constants.HT_XEN_HVM in self.cfg.GetClusterInfo().enabled_hypervisors: |
|
| 1818 | 1818 |
to_copy.append(constants.VNC_PASSWORD_FILE) |
| 1819 | 1819 |
for fname in to_copy: |
| 1820 | 1820 |
result = rpc.call_upload_file([node], fname) |
| ... | ... | |
| 3493 | 3493 |
self.op.vnc_bind_address) |
| 3494 | 3494 |
|
| 3495 | 3495 |
# Xen HVM device type checks |
| 3496 |
if self.op.hypervisor == constants.HT_XEN_HVM31:
|
|
| 3496 |
if self.op.hypervisor == constants.HT_XEN_HVM: |
|
| 3497 | 3497 |
if self.op.hvm_nic_type not in constants.HT_HVM_VALID_NIC_TYPES: |
| 3498 | 3498 |
raise errors.OpPrereqError("Invalid NIC type %s specified for Xen HVM"
|
| 3499 | 3499 |
" hypervisor" % self.op.hvm_nic_type) |
| ... | ... | |
| 4433 | 4433 |
} |
| 4434 | 4434 |
|
| 4435 | 4435 |
htkind = instance.hypervisor |
| 4436 |
if htkind == constants.HT_XEN_PVM30:
|
|
| 4436 |
if htkind == constants.HT_XEN_PVM: |
|
| 4437 | 4437 |
idict["kernel_path"] = instance.kernel_path |
| 4438 | 4438 |
idict["initrd_path"] = instance.initrd_path |
| 4439 | 4439 |
|
| 4440 |
if htkind == constants.HT_XEN_HVM31:
|
|
| 4440 |
if htkind == constants.HT_XEN_HVM: |
|
| 4441 | 4441 |
idict["hvm_boot_order"] = instance.hvm_boot_order |
| 4442 | 4442 |
idict["hvm_acpi"] = instance.hvm_acpi |
| 4443 | 4443 |
idict["hvm_pae"] = instance.hvm_pae |
| ... | ... | |
| 4659 | 4659 |
" node %s" % node) |
| 4660 | 4660 |
|
| 4661 | 4661 |
# Xen HVM device type checks |
| 4662 |
if instance.hypervisor == constants.HT_XEN_HVM31:
|
|
| 4662 |
if instance.hypervisor == constants.HT_XEN_HVM: |
|
| 4663 | 4663 |
if self.op.hvm_nic_type is not None: |
| 4664 | 4664 |
if self.op.hvm_nic_type not in constants.HT_HVM_VALID_NIC_TYPES: |
| 4665 | 4665 |
raise errors.OpPrereqError("Invalid NIC type %s specified for Xen"
|
Also available in: Unified diff