summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-02 20:18:41 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-02 20:18:41 +0200
commit7fa09dd0de1d657d6c854e09f41091008c99033e (patch)
tree7733250fe45ffcb0dc91647e596a15f5508d7cab
parent79793caaa6b7c148b41f38f3ac01b1d1fc7f9a7f (diff)
downloadvyos-1x-7fa09dd0de1d657d6c854e09f41091008c99033e.tar.gz
vyos-1x-7fa09dd0de1d657d6c854e09f41091008c99033e.zip
bridge: l2tpv3: T1823: readjust overall priorities
Every interface on the system can be a member of a bridge - thus the bridge interface must be the one interface which has the highest priority compared to all other interfaces - incl. l2tpv3. With this change the system boots up fine with also l2tpv3 interfaces participating as bridge members. This change was needed as a l2tpv3 interface requires proper configured routing oin the system, else adding the interface will fail miserably: FileNotFoundError: [Errno 2] ip l2tp add tunnel tunnel_id 200 peer_tunnel_id 100 udp_sport 4000 udp_dport 3000 encap udp local 172.18.201.10 remote 172.18.203.10 returned: RTNETLINK answers: Network is unreachable
-rw-r--r--interface-definitions/interfaces-bridge.xml.in2
-rw-r--r--interface-definitions/interfaces-l2tpv3.xml.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index f41110a3f..a0a309fb7 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -5,7 +5,7 @@
<tagNode name="bridge" owner="${vyos_conf_scripts_dir}/interfaces-bridge.py">
<properties>
<help>Bridge Interface</help>
- <priority>470</priority>
+ <priority>489</priority>
<constraint>
<regex>br[0-9]+$</regex>
</constraint>
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index f9985ad67..0ebeebf0f 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -5,7 +5,7 @@
<tagNode name="l2tpv3" owner="${vyos_conf_scripts_dir}/interfaces-l2tpv3.py">
<properties>
<help>Layer 2 Tunnel Protocol Version 3 (L2TPv3) Interface</help>
- <priority>469</priority>
+ <priority>485</priority>
<constraint>
<regex>l2tpeth[0-9]+$</regex>
</constraint>