Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions modules/virt-creating-bridge-nad-cli.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ spec:
"plugins": [
{
"type": "cnv-bridge", <3>
"bridge": "br0" <4>
"bridge": "br0", <4>
"vlan": 1 <5>
},
{
"type": "cnv-tuning" <5>
"type": "cnv-tuning" <6>
}
]
}'
Expand All @@ -49,7 +50,8 @@ will only run on nodes that have the `br0` bridge connected.
the network for this NetworkAttachmentDefinition. Do not change this field unless
you want to use a different CNI.
<4> You must substitute the actual name of the bridge, if it is not `br0`.
<5> Required. This allows the MAC pool manager to assign a unique MAC address to the connection.
<5> Optional: The VLAN tag.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With my context, this doesn't look like enough information. If your users are going to know what it means, it's fine, but I think it needs another half-sentence.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the vlan is established outside of the cluster. A user will already about it in order to use it.

<6> Required. This allows the MAC pool manager to assign a unique MAC address to the connection.

+
[source,terminal]
Expand Down
30 changes: 16 additions & 14 deletions modules/virt-pxe-booting-with-mac-address.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,22 @@ metadata:
name: pxe-net-conf
spec:
config: '{
"cniVersion": "0.3.1",
"name": "pxe-net-conf",
"plugins": [
{
"type": "cnv-bridge",
"bridge": "br1"
},
{
"type": "cnv-tuning" <1>
}
]
}'
----
<1> The `cnv-tuning` plug-in provides support for custom MAC addresses.
"cniVersion": "0.3.1",
"name": "pxe-net-conf",
"plugins": [
{
"type": "cnv-bridge",
"bridge": "br1",
"vlan": 1 <1>
},
{
"type": "cnv-tuning" <2>
}
]
}'
----
<1> Optional: The VLAN tag.
<2> The `cnv-tuning` plug-in provides support for custom MAC addresses.
+
[NOTE]
====
Expand Down