Skip to content

Commit 25d78f8

Browse files
Merge pull request #27180 from aburdenthehand/cnv-bz1886794-vlan-example
CNV BZ#1886794 VLAN param in brige NAD
2 parents 5fc605a + feb8566 commit 25d78f8

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

modules/virt-creating-bridge-nad-cli.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ spec:
3434
"plugins": [
3535
{
3636
"type": "cnv-bridge", <3>
37-
"bridge": "br0" <4>
37+
"bridge": "br0", <4>
38+
"vlan": 1 <5>
3839
},
3940
{
40-
"type": "cnv-tuning" <5>
41+
"type": "cnv-tuning" <6>
4142
}
4243
]
4344
}'
@@ -49,7 +50,8 @@ will only run on nodes that have the `br0` bridge connected.
4950
the network for this NetworkAttachmentDefinition. Do not change this field unless
5051
you want to use a different CNI.
5152
<4> You must substitute the actual name of the bridge, if it is not `br0`.
52-
<5> Required. This allows the MAC pool manager to assign a unique MAC address to the connection.
53+
<5> Optional: The VLAN tag.
54+
<6> Required. This allows the MAC pool manager to assign a unique MAC address to the connection.
5355

5456
+
5557
[source,terminal]

modules/virt-pxe-booting-with-mac-address.adoc

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,22 @@ metadata:
3131
name: pxe-net-conf
3232
spec:
3333
config: '{
34-
"cniVersion": "0.3.1",
35-
"name": "pxe-net-conf",
36-
"plugins": [
37-
{
38-
"type": "cnv-bridge",
39-
"bridge": "br1"
40-
},
41-
{
42-
"type": "cnv-tuning" <1>
43-
}
44-
]
45-
}'
46-
----
47-
<1> The `cnv-tuning` plug-in provides support for custom MAC addresses.
34+
"cniVersion": "0.3.1",
35+
"name": "pxe-net-conf",
36+
"plugins": [
37+
{
38+
"type": "cnv-bridge",
39+
"bridge": "br1",
40+
"vlan": 1 <1>
41+
},
42+
{
43+
"type": "cnv-tuning" <2>
44+
}
45+
]
46+
}'
47+
----
48+
<1> Optional: The VLAN tag.
49+
<2> The `cnv-tuning` plug-in provides support for custom MAC addresses.
4850
+
4951
[NOTE]
5052
====

0 commit comments

Comments
 (0)