diff options
| author | Robert Göhler <github@ghlr.de> | 2023-02-06 20:59:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-06 20:59:34 +0100 |
| commit | 38d3d3cff3d643a1a63c4997ba243df67b3de1ad (patch) | |
| tree | 2b2b77594a833fc6d596d042f2ba1f3fe971bc3c | |
| parent | 4e4db6639a4b4aa125ba9fb32078af74e96a4440 (diff) | |
| parent | 86422eef63496e7bf659bbccf81014bc424961e9 (diff) | |
| download | vyos-documentation-38d3d3cff3d643a1a63c4997ba243df67b3de1ad.tar.gz vyos-documentation-38d3d3cff3d643a1a63c4997ba243df67b3de1ad.zip | |
Merge pull request #951 from nicolas-fort/dhcp-relay-interface
T2408: dhcp relay interface: add docs for new listen-interface and up…
| -rw-r--r-- | docs/configuration/service/dhcp-relay.rst | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/docs/configuration/service/dhcp-relay.rst b/docs/configuration/service/dhcp-relay.rst index a93c1046..43abf254 100644 --- a/docs/configuration/service/dhcp-relay.rst +++ b/docs/configuration/service/dhcp-relay.rst @@ -20,8 +20,20 @@ Configuration .. cfgcmd:: set service dhcp-relay interface <interface> - Interfaces that participate in the DHCP relay process, including the uplink - to the DHCP server. + Interfaces that participate in the DHCP relay process. If this command is + used, at least two entries of it are required: one for the interface that + captures the dhcp-requests, and one for the interface to forward such + requests. A warning message will be shown if this command is used, since + new implementations should use ``listen-interface`` and + ``upstream-interface``. + +.. cfgcmd:: set service dhcp-relay listen-interface <interface> + + Interface for DHCP Relay Agent to listen for requests. + +.. cfgcmd:: set service dhcp-relay upstream-interface <interface> + + Interface for DHCP Relay Agent to forward requests out. .. cfgcmd:: set service dhcp-relay server <server> @@ -70,8 +82,8 @@ Example * Listen for DHCP requests on interface ``eth1``. * DHCP server is located at IPv4 address 10.0.1.4 on ``eth2``. -* Router receives DHCP client requests on ``eth1`` and relays them to the server - at 10.0.1.4 on ``eth2``. +* Router receives DHCP client requests on ``eth1`` and relays them to the + server at 10.0.1.4 on ``eth2``. .. figure:: /_static/images/service_dhcp-relay01.png :scale: 80 % @@ -84,6 +96,19 @@ The generated configuration will look like: .. code-block:: none show service dhcp-relay + listen-interface eth1 + upstrem-interface eth2 + server 10.0.1.4 + relay-options { + relay-agents-packets discard + } + +Also, for backwards compatibility this configuration, which uses generic +interface definition, is still valid: + +.. code-block:: none + + show service dhcp-relay interface eth1 interface eth2 server 10.0.1.4 |