Revision 8a348b15 lib/cmdlib/instance_utils.py
| b/lib/cmdlib/instance_utils.py | ||
|---|---|---|
| 94 | 94 |
} |
| 95 | 95 |
if nics: |
| 96 | 96 |
nic_count = len(nics) |
| 97 |
for idx, (name, _, ip, mac, mode, link, net, netinfo) in enumerate(nics):
|
|
| 97 |
for idx, (name, uuid, ip, mac, mode, link, net, netinfo) in enumerate(nics):
|
|
| 98 | 98 |
if ip is None: |
| 99 | 99 |
ip = "" |
| 100 |
env["INSTANCE_NIC%d_NAME" % idx] = name |
|
| 100 |
if name: |
|
| 101 |
env["INSTANCE_NIC%d_NAME" % idx] = name |
|
| 102 |
env["INSTANCE_NIC%d_UUID" % idx] = uuid |
|
| 101 | 103 |
env["INSTANCE_NIC%d_IP" % idx] = ip |
| 102 | 104 |
env["INSTANCE_NIC%d_MAC" % idx] = mac |
| 103 | 105 |
env["INSTANCE_NIC%d_MODE" % idx] = mode |
| ... | ... | |
| 119 | 121 |
|
| 120 | 122 |
if disks: |
| 121 | 123 |
disk_count = len(disks) |
| 122 |
for idx, (name, size, mode) in enumerate(disks): |
|
| 123 |
env["INSTANCE_DISK%d_NAME" % idx] = name |
|
| 124 |
for idx, (name, uuid, size, mode) in enumerate(disks): |
|
| 125 |
if name: |
|
| 126 |
env["INSTANCE_DISK%d_NAME" % idx] = name |
|
| 127 |
env["INSTANCE_DISK%d_UUID" % idx] = uuid |
|
| 124 | 128 |
env["INSTANCE_DISK%d_SIZE" % idx] = size |
| 125 | 129 |
env["INSTANCE_DISK%d_MODE" % idx] = mode |
| 126 | 130 |
else: |
| ... | ... | |
| 169 | 173 |
"vcpus": bep[constants.BE_VCPUS], |
| 170 | 174 |
"nics": NICListToTuple(lu, instance.nics), |
| 171 | 175 |
"disk_template": instance.disk_template, |
| 172 |
"disks": [(disk.name, disk.size, disk.mode) |
|
| 176 |
"disks": [(disk.name, disk.uuid, disk.size, disk.mode)
|
|
| 173 | 177 |
for disk in instance.disks], |
| 174 | 178 |
"bep": bep, |
| 175 | 179 |
"hvp": hvp, |
Also available in: Unified diff