Revision 503b97a9 lib/hypervisor/hv_xen.py
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
455 | 455 |
|
456 | 456 |
vif_data = [] |
457 | 457 |
for nic in instance.nics: |
458 |
nic_str = "mac=%s, bridge=%s" % (nic.mac, nic.bridge)
|
|
458 |
nic_str = "mac=%s" % (nic.mac)
|
|
459 | 459 |
ip = getattr(nic, "ip", None) |
460 | 460 |
if ip is not None: |
461 | 461 |
nic_str += ", ip=%s" % ip |
462 | 462 |
vif_data.append("'%s'" % nic_str) |
463 |
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: |
|
464 |
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] |
|
463 | 465 |
|
464 | 466 |
config.write("vif = [%s]\n" % ",".join(vif_data)) |
465 | 467 |
config.write("disk = [%s]\n" % ",".join( |
... | ... | |
575 | 577 |
else: |
576 | 578 |
nic_type_str = ", model=%s, type=ioemu" % nic_type |
577 | 579 |
for nic in instance.nics: |
578 |
nic_str = "mac=%s, bridge=%s%s" % (nic.mac, nic.bridge, nic_type_str)
|
|
580 |
nic_str = "mac=%s%s" % (nic.mac, nic_type_str)
|
|
579 | 581 |
ip = getattr(nic, "ip", None) |
580 | 582 |
if ip is not None: |
581 | 583 |
nic_str += ", ip=%s" % ip |
582 | 584 |
vif_data.append("'%s'" % nic_str) |
585 |
if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: |
|
586 |
nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] |
|
583 | 587 |
|
584 | 588 |
config.write("vif = [%s]\n" % ",".join(vif_data)) |
585 | 589 |
disk_data = cls._GetConfigFileDiskData(instance.disk_template, |
Also available in: Unified diff