Revision 72f0ef8e
| b/NEWS | ||
|---|---|---|
| 11 | 11 |
to match the underlying LUXI interface |
| 12 | 12 |
- When creating file-based instances via RAPI, the ``file_driver`` |
| 13 | 13 |
parameter no longer defaults to ``loop`` and must be specified |
| 14 |
- The deprecated "bridge" nic parameter is no longer supported. Use |
|
| 15 |
"link" instead. |
|
| 14 | 16 |
|
| 15 | 17 |
|
| 16 | 18 |
Version 2.4.0 rc2 |
| b/lib/cmdlib.py | ||
|---|---|---|
| 7473 | 7473 |
" in cluster" % mac, |
| 7474 | 7474 |
errors.ECODE_NOTUNIQUE) |
| 7475 | 7475 |
|
| 7476 |
# bridge verification |
|
| 7477 |
bridge = nic.get("bridge", None)
|
|
| 7478 |
link = nic.get("link", None)
|
|
| 7479 |
if bridge and link: |
|
| 7480 |
raise errors.OpPrereqError("Cannot pass 'bridge' and 'link'"
|
|
| 7481 |
" at the same time", errors.ECODE_INVAL) |
|
| 7482 |
elif bridge and nic_mode == constants.NIC_MODE_ROUTED: |
|
| 7483 |
raise errors.OpPrereqError("Cannot pass 'bridge' on a routed nic",
|
|
| 7484 |
errors.ECODE_INVAL) |
|
| 7485 |
elif bridge: |
|
| 7486 |
link = bridge |
|
| 7487 |
|
|
| 7476 |
# Build nic parameters |
|
| 7477 |
link = nic.get(constants.INIC_LINK, None) |
|
| 7488 | 7478 |
nicparams = {}
|
| 7489 | 7479 |
if nic_mode_req: |
| 7490 | 7480 |
nicparams[constants.NIC_MODE] = nic_mode_req |
| b/lib/constants.py | ||
|---|---|---|
| 746 | 746 |
INIC_IP = "ip" |
| 747 | 747 |
INIC_MODE = "mode" |
| 748 | 748 |
INIC_LINK = "link" |
| 749 |
INIC_BRIDGE = "bridge" |
|
| 750 | 749 |
INIC_PARAMS_TYPES = {
|
| 751 |
INIC_BRIDGE: VTYPE_STRING, |
|
| 752 | 750 |
INIC_IP: VTYPE_MAYBE_STRING, |
| 753 | 751 |
INIC_LINK: VTYPE_STRING, |
| 754 | 752 |
INIC_MAC: VTYPE_STRING, |
Also available in: Unified diff