From 5e86c158b7b7c0d628423405b26aacb6238fba5b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 13 Sep 2020 16:03:40 +0200 Subject: bonding: add new command for minimum-links --- docs/interfaces/bond.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'docs/interfaces') diff --git a/docs/interfaces/bond.rst b/docs/interfaces/bond.rst index 74089f96..d697e5d4 100644 --- a/docs/interfaces/bond.rst +++ b/docs/interfaces/bond.rst @@ -159,6 +159,25 @@ Link Administration This mode provides load balancing and fault tolerance. +.. cfgcmd:: set interfaces bonding min-links <0-16> + + Specifies the minimum number of links that must be active before asserting + carrier. It is similar to the Cisco EtherChannel min-links feature. This + allows setting the minimum number of member ports that must be up (link-up + state) before marking the bond device as up (carrier on). This is useful for + situations where higher level services such as clustering want to ensure a + minimum number of low bandwidth links are active before switchover. + + This option only affects 802.3ad mode. + + The default value is 0. This will cause carrier to be asserted (for 802.3ad + mode) whenever there is an active aggregator, regardless of the number of + available links in that aggregator. + + .. note:: Because an aggregator cannot be active without at least one + available link, setting this option to 0 or to 1 has the exact same + effect. + .. cfgcmd:: set interfaces bonding hash-policy * **layer2** - Uses XOR of hardware MAC addresses and packet type ID field -- cgit v1.2.3 From 2862a9318f8ca8a6c0bd9a8fb6bfda84e8018912 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 13 Sep 2020 16:08:12 +0200 Subject: bonding: extend operational mode commands --- docs/interfaces/bond.rst | 87 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 8 deletions(-) (limited to 'docs/interfaces') diff --git a/docs/interfaces/bond.rst b/docs/interfaces/bond.rst index d697e5d4..396242ae 100644 --- a/docs/interfaces/bond.rst +++ b/docs/interfaces/bond.rst @@ -398,12 +398,83 @@ with two interfaces from VyOS to a Aruba/HP 2510G switch. Operation ######### -.. code-block:: none +.. opcmd:: show interfaces bonding + + Show brief interface information. + + .. code-block:: none + + vyos@vyos:~$ show interfaces bonding + Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down + Interface IP Address S/L Description + --------- ---------- --- ----------- + bond0 - u/u my-sw1 int 23 and 24 + bond0.10 192.168.0.1/24 u/u office-net + bond0.100 10.10.10.1/24 u/u management-net + + +.. opcmd:: show interfaces bonding + + Show detailed information on given `` + + .. code-block:: none + + vyos@vyos:~$ show interfaces bonding bond5 + bond5: mtu 1500 qdisc noqueue state DOWN group default qlen 1000 + link/ether 00:50:56:bf:ef:aa brd ff:ff:ff:ff:ff:ff + inet6 fe80::e862:26ff:fe72:2dac/64 scope link tentative + valid_lft forever preferred_lft forever + + RX: bytes packets errors dropped overrun mcast + 0 0 0 0 0 0 + TX: bytes packets errors dropped carrier collisions + 0 0 0 0 0 0 + +.. opcmd:: show interfaces bonding detail + + Show detailed information about the underlaying physical links on given + bond ``. + + .. code-block:: none + + vyos@vyos:~$ show interfaces bonding bond5 detail + Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011) + + Bonding Mode: IEEE 802.3ad Dynamic link aggregation + Transmit Hash Policy: layer2 (0) + MII Status: down + MII Polling Interval (ms): 100 + Up Delay (ms): 0 + Down Delay (ms): 0 + + 802.3ad info + LACP rate: slow + Min links: 0 + Aggregator selection policy (ad_select): stable + + Slave Interface: eth1 + MII Status: down + Speed: Unknown + Duplex: Unknown + Link Failure Count: 0 + Permanent HW addr: 00:50:56:bf:ef:aa + Slave queue ID: 0 + Aggregator ID: 1 + Actor Churn State: churned + Partner Churn State: churned + Actor Churned Count: 1 + Partner Churned Count: 1 + + Slave Interface: eth2 + MII Status: down + Speed: Unknown + Duplex: Unknown + Link Failure Count: 0 + Permanent HW addr: 00:50:56:bf:19:26 + Slave queue ID: 0 + Aggregator ID: 2 + Actor Churn State: churned + Partner Churn State: churned + Actor Churned Count: 1 + Partner Churned Count: 1 - vyos@vyos:~$ show interfaces bonding - Codes: S - State, L - Link, u - Up, D - Down, A - Admin Down - Interface IP Address S/L Description - --------- ---------- --- ----------- - bond0 - u/u my-sw1 int 23 and 24 - bond0.10 192.168.0.1/24 u/u office-net - bond0.100 10.10.10.1/24 u/u management-net -- cgit v1.2.3 From a010ef519007dc3a4d7c08144a665134617bade2 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 14 Sep 2020 21:03:33 +0200 Subject: bonding: add example with Arista EOS --- docs/_static/images/vyos_arista_bond_lacp.png | Bin 0 -> 40622 bytes docs/interfaces/bond.rst | 115 ++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 docs/_static/images/vyos_arista_bond_lacp.png (limited to 'docs/interfaces') diff --git a/docs/_static/images/vyos_arista_bond_lacp.png b/docs/_static/images/vyos_arista_bond_lacp.png new file mode 100644 index 00000000..6c9ef8ec Binary files /dev/null and b/docs/_static/images/vyos_arista_bond_lacp.png differ diff --git a/docs/interfaces/bond.rst b/docs/interfaces/bond.rst index 396242ae..9e67809a 100644 --- a/docs/interfaces/bond.rst +++ b/docs/interfaces/bond.rst @@ -395,6 +395,121 @@ with two interfaces from VyOS to a Aruba/HP 2510G switch. vlan 10 tagged Trk1 vlan 100 tagged Trk1 +Arista EOS +^^^^^^^^^^ + +When utilizing VyOS in an environment with Arista gear you can use this blue +print as an initial setup to get an LACP bond / port-channel operational between +those two devices. + +Lets assume the following topology: + +.. figure:: /_static/images/vyos_arista_bond_lacp.png + :alt: VyOS Arista EOS setup + +**R1** + + .. code-block:: none + + interfaces { + bonding bond10 { + hash-policy layer3+4 + member { + interface eth1 + interface eth2 + } + mode 802.3ad + vif 100 { + address 192.0.2.1/30 + address 2001:db8::1/64 + } + } + +**R2** + + .. code-block:: none + + interfaces { + bonding bond10 { + hash-policy layer3+4 + member { + interface eth1 + interface eth2 + } + mode 802.3ad + vif 100 { + address 192.0.2.2/30 + address 2001:db8::2/64 + } + } + +**SW1** + + .. code-block:: none + + ! + vlan 100 + name FOO + ! + interface Port-Channel10 + switchport trunk allowed vlan 100 + switchport mode trunk + spanning-tree portfast + ! + interface Port-Channel20 + switchport mode trunk + no spanning-tree portfast auto + spanning-tree portfast network + ! + interface Ethernet1 + channel-group 10 mode active + ! + interface Ethernet2 + channel-group 10 mode active + ! + interface Ethernet3 + channel-group 20 mode active + ! + interface Ethernet4 + channel-group 20 mode active + ! + +**SW2** + + .. code-block:: none + + ! + vlan 100 + name FOO + ! + interface Port-Channel10 + switchport trunk allowed vlan 100 + switchport mode trunk + spanning-tree portfast + ! + interface Port-Channel20 + switchport mode trunk + no spanning-tree portfast auto + spanning-tree portfast network + ! + interface Ethernet1 + channel-group 10 mode active + ! + interface Ethernet2 + channel-group 10 mode active + ! + interface Ethernet3 + channel-group 20 mode active + ! + interface Ethernet4 + channel-group 20 mode active + ! + +.. note:: When using EVE-NG to lab this environment ensure you are using e1000 + as the desired driver for your VyOS network interfaces. When using the regular + virtio network driver no LACP PDUs will be sent by VyOS thus the port-channel + will never become active! + Operation ######### -- cgit v1.2.3 From 59fb884e37e84815cd4467dbfc17e23f5fef64bb Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 20 Sep 2020 14:36:33 +0200 Subject: wwan: rename CLI command "ondemand" to "connect-on-demand" --- docs/interfaces/pppoe.rst | 2 +- docs/interfaces/wirelessmodem.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/interfaces') diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst index ae6b11cc..75fe0a40 100644 --- a/docs/interfaces/pppoe.rst +++ b/docs/interfaces/pppoe.rst @@ -79,7 +79,7 @@ Configuration .. cfgcmd:: set interfaces pppoe connect-on-demand - Enables or disables on-demand PPPoE connection on a PPPoE unit. + When set the interface is enabled for "dial-on-demand". Use this command to instruct the system to establish a PPPoE connections automatically once traffic passes through the interface. A disabled on-demand diff --git a/docs/interfaces/wirelessmodem.rst b/docs/interfaces/wirelessmodem.rst index 5cded6c5..c41e71bf 100644 --- a/docs/interfaces/wirelessmodem.rst +++ b/docs/interfaces/wirelessmodem.rst @@ -35,9 +35,9 @@ Address Do not install DNS nameservers received from ISP into system wide nameserver list. -.. cfgcmd:: set interfaces wirelessmodem ondemand +.. cfgcmd:: set interfaces wirelessmodem connect-on-demand - Enables or disables on-demand WWAN connection. + When set the interface is enabled for "dial-on-demand". Use this command to instruct the system to establish a PPP connection automatically once traffic passes through the interface. A disabled on-demand -- cgit v1.2.3 From 61acd8021f8ab7ca502412bc0796a55bf4f1b255 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 16 Oct 2020 08:57:36 -0400 Subject: vxlan syntax correction: link and remote-port parameters are not available in rolling release Replaced "link" with "source-interface" and "remote-port" with "port" .. code-block:: none vyos@vyos# set int vxlan vxlan1 Possible completions: + address IP address description Interface specific description disable Administratively disable interface > firewall Firewall options group Multicast group address for VXLAN interface > ip IPv4 routing parameters > ipv6 IPv6 routing parameters mac Media Access Control (MAC) address mtu Maximum Transmission Unit (MTU) > policy Policy route options port Destination port of VXLAN tunnel (default: 8472) remote Remote address of VXLAN tunnel source-address VXLAN source address source-interface Physical interface used for connection vni Virtual Network Identifier --- docs/interfaces/vxlan.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/interfaces') diff --git a/docs/interfaces/vxlan.rst b/docs/interfaces/vxlan.rst index a11f4b62..bf3b6dee 100644 --- a/docs/interfaces/vxlan.rst +++ b/docs/interfaces/vxlan.rst @@ -230,7 +230,7 @@ traffic from. set interfaces bridge br241 member interface 'vxlan241' set interfaces vxlan vxlan241 group '239.0.0.241' - set interfaces vxlan vxlan241 link 'eth0' + set interfaces vxlan vxlan241 source-interface 'eth0' set interfaces vxlan vxlan241 vni '241' ! Our seconds vxlan interface @@ -239,7 +239,7 @@ traffic from. set interfaces bridge br242 member interface 'vxlan242' set interfaces vxlan vxlan242 group '239.0.0.242' - set interfaces vxlan vxlan242 link 'eth0' + set interfaces vxlan vxlan242 source-interface 'eth0' set interfaces vxlan vxlan242 vni '242' **Leaf3 configuration:** @@ -255,7 +255,7 @@ traffic from. set interfaces bridge br241 member interface 'vxlan241' set interfaces vxlan vxlan241 group '239.0.0.241' - set interfaces vxlan vxlan241 link 'eth0' + set interfaces vxlan vxlan241 source-interface 'eth0' set interfaces vxlan vxlan241 vni '241' ! Our seconds vxlan interface @@ -264,7 +264,7 @@ traffic from. set interfaces bridge br242 member interface 'vxlan242' set interfaces vxlan vxlan242 group '239.0.0.242' - set interfaces vxlan vxlan242 link 'eth0' + set interfaces vxlan vxlan242 source-interface 'eth0' set interfaces vxlan vxlan242 vni '242' As you can see, Leaf2 and Leaf3 configuration is almost identical. There are @@ -300,7 +300,7 @@ same on all Leafs that has this interface. .. code-block:: none - set interfaces vxlan vxlan241 link 'eth0' + set interfaces vxlan vxlan241 source-interface 'eth0' Sets the interface to listen for multicast packets on. Could be a loopback, not yet tested. @@ -314,7 +314,7 @@ multicast-address. .. code-block:: none - set interfaces vxlan vxlan241 remote-port 12345 + set interfaces vxlan vxlan241 port 12345 The destination port used for creating a VXLAN interface in Linux defaults to its pre-standard value of 8472 to preserve backwards compatibility. A @@ -331,7 +331,7 @@ set directly. Let's change the Multicast example from above: # leaf2 and leaf3 delete interfaces vxlan vxlan241 group '239.0.0.241' - delete interfaces vxlan vxlan241 link 'eth0' + delete interfaces vxlan vxlan241 source-interface 'eth0' # leaf2 set interface vxlan vxlan241 remote 10.1.3.3 @@ -340,4 +340,4 @@ set directly. Let's change the Multicast example from above: set interface vxlan vxlan241 remote 10.1.2.2 The default port udp is set to 8472. -It can be changed with ``set interface vxlan remote-port `` +It can be changed with ``set interface vxlan port `` -- cgit v1.2.3 From 7e35e645268e95e592d47e0450aa07eb8395eb84 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 5 Nov 2020 13:12:49 +0100 Subject: interfaces: add IPv6 DHCPv6-PD documentation for PPPoE and Ethernet --- docs/interfaces/ethernet.rst | 38 ++++++++++++++++++++++++++++++++++++++ docs/interfaces/pppoe.rst | 28 ++++++++++++++-------------- 2 files changed, 52 insertions(+), 14 deletions(-) (limited to 'docs/interfaces') diff --git a/docs/interfaces/ethernet.rst b/docs/interfaces/ethernet.rst index 0633ad2c..95aef851 100644 --- a/docs/interfaces/ethernet.rst +++ b/docs/interfaces/ethernet.rst @@ -95,6 +95,44 @@ Link Administration Configure :abbr:`MTU (Maximum Transmission Unit)` on given ``. It is the size (in bytes) of the largest ethernet frame sent on this link. +Prefix Delegation (DHCPv6-PD) +----------------------------- + +VyOS 1.3 (equuleus) supports DHCPv6-PD. DHCPv6 Prefix Delegation is supported +by most ISPs who provide native IPv6 for consumers on fixed networks. + +.. cfgcmd:: set interfaces ethernet dhcpv6-option pd length + + Some ISPs by default only delegate a /64 prefix. To request for a specific + prefix size use this option to request for a bigger delegation for this pd + ``. This value + is in the range from 32 - 64 so you could request up to /32 down to a /64 + delegation. + + Default value is 64. + +.. cfgcmd:: set interfaces ethernet dhcpv6-option pd interface address
+ + Specify the interface address used locally on the interfcae where the prefix + has been delegated to. ID must be a decimal integer. + + It will be combined with the delegated prefix and the sla-id to form a complete + interface address. The default is to use the EUI-64 address of the interface. + + Example: + + Using ```` value 65535 will assign IPv6 address ``::ffff`` to the + interface. + +.. cfgcmd:: set interfaces ethernet dhcpv6-option pd interface sla-id + + Specify the identifier value of the site-level aggregator (SLA) on the + interface. ID must be a decimal number greater then 0 which fits in the length + of SLA IDs (see below). For example, if ID is 1 and the client is delegated + an IPv6 prefix 2001:db8:ffff::/48, dhcp6c will combine the two values into a + single IPv6 prefix, 2001:db8:ffff:1::/64, and will configure the prefix on + the specified interface. + Operation ========= diff --git a/docs/interfaces/pppoe.rst b/docs/interfaces/pppoe.rst index 75fe0a40..8fa35492 100644 --- a/docs/interfaces/pppoe.rst +++ b/docs/interfaces/pppoe.rst @@ -183,27 +183,27 @@ by most ISPs who provide native IPv6 for consumers on fixed networks. Default value is 64. -.. cfgcmd:: set interfaces pppoe dhcpv6-option pd interface address +.. cfgcmd:: set interfaces pppoe dhcpv6-option pd interface address
- This statement specifies the interface address used locally on the interfcae - where the prefix has been delegated to. ID must be a decimal integer. - It will be combined with the delegated prefix and the sla-id to form a - complete interface address. The default is to use the EUI-64 address of the - interface. + Specify the interface address used locally on the interfcae where the prefix + has been delegated to. ID must be a decimal integer. + + It will be combined with the delegated prefix and the sla-id to form a complete + interface address. The default is to use the EUI-64 address of the interface. Example: - Using `` value 65535 will assign IPv6 address ::ffff to the + Using ```` value 65535 will assign IPv6 address ``::ffff`` to the interface. -.. cfgcmd:: set interfaces pppoe dhcpv6-option pd interface sla-id +.. cfgcmd:: set interfaces pppoe dhcpv6-option pd interface sla-id - This statement specifies the identifier value of the site-level aggregator - (SLA) on the interface. ID must be a decimal number greater then 0 which - fits in the length of SLA IDs (see below). For example, if ID is 1 and the - client is delegated an IPv6 prefix 2001:db8:ffff::/48, dhcp6c will combine - the two values into a single IPv6 prefix, 2001:db8:ffff:1::/64, and will - configure the prefix on the specified interface. + Specify the identifier value of the site-level aggregator (SLA) on the + interface. ID must be a decimal number greater then 0 which fits in the length + of SLA IDs (see below). For example, if ID is 1 and the client is delegated + an IPv6 prefix 2001:db8:ffff::/48, dhcp6c will combine the two values into a + single IPv6 prefix, 2001:db8:ffff:1::/64, and will configure the prefix on + the specified interface. Operation ========= -- cgit v1.2.3 From 58b3a577e5386e52ccfade8c5d9c3d5bc36f2839 Mon Sep 17 00:00:00 2001 From: rebortg Date: Mon, 9 Nov 2020 21:30:06 +0100 Subject: Bridge: convert address to cmdinclude --- docs/_include/interface-address.txt | 21 +++++++++++++++++++++ docs/interfaces/bridge.rst | 24 +++--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 docs/_include/interface-address.txt (limited to 'docs/interfaces') diff --git a/docs/_include/interface-address.txt b/docs/_include/interface-address.txt new file mode 100644 index 00000000..1de05c31 --- /dev/null +++ b/docs/_include/interface-address.txt @@ -0,0 +1,21 @@ +.. cfgcmd:: set interfaces {{ var0 }} address
+ + Configure interface `` with one or more interface + addresses. + + * **address** can be specified multiple times as IPv4 and/or IPv6 + address, e.g. 192.0.2.1/24 and/or 2001:db8::1/64 + * **dhcp** interface address is received by DHCP from a DHCP server + on this segment. + * **dhcpv6** interface address is received by DHCPv6 from a DHCPv6 + server on this segment. + + Example: + + .. code-block:: none + + set interfaces {{ var0 }} {{ var1 }} address 192.0.2.1/24 + set interfaces {{ var0 }} {{ var1 }} address 192.0.2.2/24 + set interfaces {{ var0 }} {{ var1 }} address 2001:db8::ffff/64 + set interfaces {{ var0 }} {{ var1 }} address 2001:db8:100::ffff/64 \ No newline at end of file diff --git a/docs/interfaces/bridge.rst b/docs/interfaces/bridge.rst index a7343a0d..26e67690 100644 --- a/docs/interfaces/bridge.rst +++ b/docs/interfaces/bridge.rst @@ -20,27 +20,9 @@ Configuration Address ------- -.. cfgcmd:: set interfaces bridge address
- - Configure interface `` with one or more interface - addresses. - - * **address** can be specified multiple times as IPv4 and/or IPv6 - address, e.g. 192.0.2.1/24 and/or 2001:db8::1/64 - * **dhcp** interface address is received by DHCP from a DHCP server - on this segment. - * **dhcpv6** interface address is received by DHCPv6 from a DHCPv6 - server on this segment. - - Example: - - .. code-block:: none - - set interfaces bridge br0 address 192.0.2.1/24 - set interfaces bridge br0 address 192.0.2.2/24 - set interfaces bridge br0 address 2001:db8::ffff/64 - set interfaces bridge br0 address 2001:db8:100::ffff/64 +.. cmdinclude:: ../_include/interface-address.txt + :var0: bridge + :var1: br0 .. cfgcmd:: set interfaces bridge ipv6 address autoconf -- cgit v1.2.3 From b7e61a03f09b93cdaa91a3c6b13d967621483f5c Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 10 Nov 2020 20:02:47 +0100 Subject: interfaces: extend usage of new cmdinclude directive for bridge, bond, eth, peth, vxlan Commit c46473a ("docs: add ..cmdinclude:: directive") added support for including common text but only replacing individual labels so there can be source of truth also for the documentation. --- docs/_include/interface-ipv6-addr-autoconf.txt | 20 +++++++++++++ docs/_include/interface-ipv6-addr-eui64.txt | 8 +++++ docs/interfaces/bond.rst | 41 ++++++-------------------- docs/interfaces/bridge.rst | 21 ++++--------- docs/interfaces/common-ip-ipv6-addr.txt | 8 ----- docs/interfaces/common-ipv6-addr-autoconf.txt | 12 -------- docs/interfaces/ethernet.rst | 32 ++++++-------------- docs/interfaces/pseudo-ethernet.rst | 23 ++++++--------- docs/interfaces/vxlan.rst | 36 ++++++---------------- 9 files changed, 70 insertions(+), 131 deletions(-) create mode 100644 docs/_include/interface-ipv6-addr-autoconf.txt create mode 100644 docs/_include/interface-ipv6-addr-eui64.txt delete mode 100644 docs/interfaces/common-ip-ipv6-addr.txt delete mode 100644 docs/interfaces/common-ipv6-addr-autoconf.txt (limited to 'docs/interfaces') diff --git a/docs/_include/interface-ipv6-addr-autoconf.txt b/docs/_include/interface-ipv6-addr-autoconf.txt new file mode 100644 index 00000000..22f9ee59 --- /dev/null +++ b/docs/_include/interface-ipv6-addr-autoconf.txt @@ -0,0 +1,20 @@ +.. cfgcmd:: set interfaces {{ var0 }} ipv6 address autoconf + + + :abbr:`SLAAC (Stateless Address Autoconfiguration)` + :rfc:`4862`. IPv6 hosts can configure themselves automatically when connected + to an IPv6 network using the Neighbor Discovery Protocol via :abbr:`ICMPv6 + (Internet Control Message Protocol version 6)` router discovery messages. + When first connected to a network, a host sends a link-local router + solicitation multicast request for its configuration parameters; routers + respond to such a request with a router advertisement packet that contains + Internet Layer configuration parameters. + + .. note:: This method automatically disables IPv6 traffic forwarding on the + interface in question. + + Example: + + .. code-block:: none + + set interfaces {{ var0 }} {{ var1 }} ipv6 address autoconf diff --git a/docs/_include/interface-ipv6-addr-eui64.txt b/docs/_include/interface-ipv6-addr-eui64.txt new file mode 100644 index 00000000..40f22e5f --- /dev/null +++ b/docs/_include/interface-ipv6-addr-eui64.txt @@ -0,0 +1,8 @@ +.. cfgcmd:: set interfaces {{ var0 }} ipv6 address eui64 + + :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in + :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address. + + .. code-block:: none + + set interfaces {{ var0 }} {{ var1 }} ipv6 address eui64 2001:db8:beef::/64 diff --git a/docs/interfaces/bond.rst b/docs/interfaces/bond.rst index 9e67809a..78099f01 100644 --- a/docs/interfaces/bond.rst +++ b/docs/interfaces/bond.rst @@ -16,40 +16,17 @@ Configuration Address ------- -.. cfgcmd:: set interfaces bonding address
+.. cmdinclude:: ../_include/interface-address.txt + :var0: bonding + :var1: bond0 - Configure interface `` with one or more interface addresses. - - * **address** can be specified multiple times as IPv4 and/or IPv6 address, - e.g. 192.0.2.1/24 and/or 2001:db8::1/64 - * **dhcp** interface address is received by DHCP from a DHCP server on this - segment. - * **dhcpv6** interface address is received by DHCPv6 from a DHCPv6 server on - this segment. - - Example: - - .. code-block:: none - - set interfaces bonding bond0 address 192.0.2.1/24 - set interfaces bonding bond0 address 192.0.2.2/24 - set interfaces bonding bond0 address 2001:db8::ffff/64 - set interfaces bonding bond0 address 2001:db8:100::ffff/64 - - -.. cfgcmd:: set interfaces bonding ipv6 address autoconf - - .. include:: common-ipv6-addr-autoconf.txt - -.. cfgcmd:: set interfaces bonding ipv6 address eui64 - - :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in - :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 address. - - .. code-block:: none - - set interfaces bonding bond0 ipv6 address eui64 2001:db8:beef::/64 +.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt + :var0: bonding + :var1: bond0 +.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt + :var0: bonding + :var1: bond0 Link Administration ------------------- diff --git a/docs/interfaces/bridge.rst b/docs/interfaces/bridge.rst index 26e67690..aec1c5d8 100644 --- a/docs/interfaces/bridge.rst +++ b/docs/interfaces/bridge.rst @@ -24,22 +24,13 @@ Address :var0: bridge :var1: br0 +.. cmdinclude:: ../_include/interface-ipv6-addr-autoconf.txt + :var0: bridge + :var1: br0 -.. cfgcmd:: set interfaces bridge ipv6 address autoconf - - .. include:: common-ipv6-addr-autoconf.txt - -.. cfgcmd:: set interfaces bridge ipv6 address eui64 - - - :abbr:`EUI-64 (64-Bit Extended Unique Identifier)` as specified in - :rfc:`4291` allows a host to assign iteslf a unique 64-Bit IPv6 - address. - - .. code-block:: none - - set interfaces bridge br0 ipv6 address eui64 2001:db8:beef::/64 - +.. cmdinclude:: ../_include/interface-ipv6-addr-eui64.txt + :var0: bridge + :var1: br0 .. cfgcmd:: set interfaces bridge aging