Revision 3fc175f0 scripts/gnt-instance
| b/scripts/gnt-instance | ||
|---|---|---|
| 729 | 729 |
else: |
| 730 | 730 |
hvm_boot_order = opts.hvm_boot_order |
| 731 | 731 |
|
| 732 |
hvm_acpi = opts.hvm_acpi == _VALUE_TRUE |
|
| 733 |
hvm_pae = opts.hvm_pae == _VALUE_TRUE |
|
| 732 |
if opts.hvm_acpi is None: |
|
| 733 |
hvm_acpi = opts.hvm_acpi |
|
| 734 |
else: |
|
| 735 |
hvm_acpi = opts.hvm_acpi == _VALUE_TRUE |
|
| 734 | 736 |
|
| 735 |
if ((opts.hvm_cdrom_image_path is not None) and |
|
| 736 |
(opts.hvm_cdrom_image_path.lower() == constants.VALUE_NONE)): |
|
| 737 |
hvm_cdrom_image_path = None |
|
| 737 |
if opts.hvm_pae is None: |
|
| 738 |
hvm_pae = opts.hvm_pae |
|
| 738 | 739 |
else: |
| 739 |
hvm_cdrom_image_path = opts.hvm_cdrom_image_path
|
|
| 740 |
hvm_pae = opts.hvm_pae == _VALUE_TRUE
|
|
| 740 | 741 |
|
| 741 | 742 |
op = opcodes.OpSetInstanceParams(instance_name=args[0], mem=opts.mem, |
| 742 | 743 |
vcpus=opts.vcpus, ip=opts.ip, |
| ... | ... | |
| 745 | 746 |
initrd_path=opts.initrd_path, |
| 746 | 747 |
hvm_boot_order=hvm_boot_order, |
| 747 | 748 |
hvm_acpi=hvm_acpi, hvm_pae=hvm_pae, |
| 748 |
hvm_cdrom_image_path=hvm_cdrom_image_path, |
|
| 749 |
hvm_cdrom_image_path= |
|
| 750 |
opts.hvm_cdrom_image_path, |
|
| 749 | 751 |
vnc_bind_address=opts.vnc_bind_address) |
| 750 | 752 |
|
| 751 | 753 |
result = SubmitOpCode(op) |
Also available in: Unified diff