summaryrefslogtreecommitdiff
path: root/docs/configexamples
diff options
context:
space:
mode:
Diffstat (limited to 'docs/configexamples')
-rw-r--r--docs/configexamples/dhcp-relay-through-gre-bridge.rst11
1 files changed, 4 insertions, 7 deletions
diff --git a/docs/configexamples/dhcp-relay-through-gre-bridge.rst b/docs/configexamples/dhcp-relay-through-gre-bridge.rst
index afa4d854..0ebaa967 100644
--- a/docs/configexamples/dhcp-relay-through-gre-bridge.rst
+++ b/docs/configexamples/dhcp-relay-through-gre-bridge.rst
@@ -1,8 +1,8 @@
.. _examples-dhcp-relay-through-gre-bridge:
-DHCP Relay through GRE-Bridge
------------------------------
+DHCP Relay through a GRE bridge
+-------------------------------
Diagram
^^^^^^^
@@ -23,7 +23,7 @@ DHCP Server
set interfaces ethernet eth0 address '10.0.2.1/24'
set interfaces loopback lo address '192.168.3.3/24'
set interfaces tunnel tun100 address '172.16.0.2/30'
- set interfaces tunnel tun100 encapsulation 'gre-bridge'
+ set interfaces tunnel tun100 encapsulation 'gretap'
set interfaces tunnel tun100 local-ip '10.0.2.1'
set interfaces tunnel tun100 remote-ip '192.168.0.1'
set protocols ospf area 0 network '192.168.3.0/24'
@@ -40,7 +40,6 @@ DHCP Server
set service dhcp-server shared-network-name asdf subnet 10.2.1.0/24 range 0 stop '10.2.1.233'
set service dhcp-server shared-network-name asdf subnet 172.16.0.0/30 range 0 start '172.16.0.1'
set service dhcp-server shared-network-name asdf subnet 172.16.0.0/30 range 0 stop '172.16.0.2'
-
In-Between Router
"""""""""""""""""
@@ -52,7 +51,6 @@ In-Between Router
set protocols ospf area 0 network '192.168.0.0/24'
set protocols ospf area 0 network '10.0.2.0/24'
set protocols ospf parameters router-id '192.168.0.2'
-
DHCP Relay
""""""""""
@@ -63,7 +61,7 @@ DHCP Relay
set interfaces ethernet eth1 address '192.168.0.1/24'
set interfaces loopback lo address '10.100.100.1'
set interfaces tunnel tun100 address '172.16.0.1/30'
- set interfaces tunnel tun100 encapsulation 'gre-bridge'
+ set interfaces tunnel tun100 encapsulation 'gretap'
set interfaces tunnel tun100 local-ip '192.168.0.1'
set interfaces tunnel tun100 remote-ip '10.0.2.1'
set protocols ospf area 0 network '10.0.1.0/24'
@@ -74,4 +72,3 @@ DHCP Relay
set service dhcp-relay interface 'eth0'
set service dhcp-relay interface 'tun100'
set service dhcp-relay server '192.168.3.3'
-