Revision 53e4e875 lib/cmdlib.py
| b/lib/cmdlib.py | ||
|---|---|---|
| 267 | 267 |
|
| 268 | 268 |
if nics: |
| 269 | 269 |
nic_count = len(nics) |
| 270 |
for idx, (ip, bridge) in enumerate(nics): |
|
| 270 |
for idx, (ip, bridge, mac) in enumerate(nics):
|
|
| 271 | 271 |
if ip is None: |
| 272 | 272 |
ip = "" |
| 273 | 273 |
env["INSTANCE_NIC%d_IP" % idx] = ip |
| 274 | 274 |
env["INSTANCE_NIC%d_BRIDGE" % idx] = bridge |
| 275 |
env["INSTANCE_NIC%d_HWADDR" % idx] = mac |
|
| 275 | 276 |
else: |
| 276 | 277 |
nic_count = 0 |
| 277 | 278 |
|
| ... | ... | |
| 295 | 296 |
'status': instance.os, |
| 296 | 297 |
'memory': instance.memory, |
| 297 | 298 |
'vcpus': instance.vcpus, |
| 298 |
'nics': [(nic.ip, nic.bridge) for nic in instance.nics], |
|
| 299 |
'nics': [(nic.ip, nic.bridge, nic.mac) for nic in instance.nics],
|
|
| 299 | 300 |
} |
| 300 | 301 |
if override: |
| 301 | 302 |
args.update(override) |
Also available in: Unified diff