Revision 71aa8f73
| b/lib/cmdlib.py | ||
|---|---|---|
| 4054 | 4054 |
"disks": disks, |
| 4055 | 4055 |
"network_port": instance.network_port, |
| 4056 | 4056 |
"vcpus": instance.vcpus, |
| 4057 |
"kernel_path": instance.kernel_path, |
|
| 4058 |
"initrd_path": instance.initrd_path, |
|
| 4057 | 4059 |
} |
| 4058 | 4060 |
|
| 4059 | 4061 |
result[instance.name] = idict |
| b/scripts/gnt-instance | ||
|---|---|---|
| 626 | 626 |
buf.write(" - secondaries: %s\n" % ", ".join(instance["snodes"]))
|
| 627 | 627 |
buf.write(" Operating system: %s\n" % instance["os"])
|
| 628 | 628 |
buf.write(" Allocated network port: %s\n" % instance["network_port"])
|
| 629 |
if instance["kernel_path"] in (None, constants.VALUE_DEFAULT): |
|
| 630 |
kpath = "(default: %s)" % constants.XEN_KERNEL |
|
| 631 |
else: |
|
| 632 |
kpath = instance["kernel_path"] |
|
| 633 |
buf.write(" Kernel path: %s\n" % kpath)
|
|
| 634 |
if instance["initrd_path"] in (None, constants.VALUE_DEFAULT): |
|
| 635 |
initrd = "(default: %s)" % constants.XEN_INITRD |
|
| 636 |
elif instance["initrd_path"] == constants.VALUE_NONE: |
|
| 637 |
initrd = "(none)" |
|
| 638 |
else: |
|
| 639 |
initrd = instance["initrd_path"] |
|
| 640 |
buf.write(" initrd: %s\n" % initrd)
|
|
| 629 | 641 |
buf.write(" Hardware:\n")
|
| 630 | 642 |
buf.write(" - VCPUs: %d\n" % instance["vcpus"])
|
| 631 | 643 |
buf.write(" - memory: %dMiB\n" % instance["memory"])
|
Also available in: Unified diff