projects / packages / ganeti.git / blame
| Commit | Line | Data |
|---|---|---|
| c8ebdc52 JR |
1 | --- ganeti-2.9.3/lib/hypervisor/hv_xen.py~ 2014-01-27 10:20:35.000000000 +0100 |
| 2 | +++ ganeti-2.9.3/lib/hypervisor/hv_xen.py 2014-02-06 23:51:59.830493839 +0100 | |
| 3 | @@ -1077,7 +1077,7 @@ | |
| 4 | ip = getattr(nic, "ip", None) | |
| 5 | if ip is not None: | |
| 6 | nic_str += ", ip=%s" % ip | |
| 7 | - if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: | |
| 8 | + if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED or nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_OVS: | |
| 9 | nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] | |
| 10 | if hvp[constants.HV_VIF_SCRIPT]: | |
| 11 | nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT] | |
| 12 | @@ -1248,7 +1248,7 @@ | |
| 13 | ip = getattr(nic, "ip", None) | |
| 14 | if ip is not None: | |
| 15 | nic_str += ", ip=%s" % ip | |
| 16 | - if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED: | |
| 17 | + if nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_BRIDGED or nic.nicparams[constants.NIC_MODE] == constants.NIC_MODE_OVS: | |
| 18 | nic_str += ", bridge=%s" % nic.nicparams[constants.NIC_LINK] | |
| 19 | if hvp[constants.HV_VIF_SCRIPT]: | |
| 20 | nic_str += ", script=%s" % hvp[constants.HV_VIF_SCRIPT] |