From 056746bbbdc0cc139d20b9fecb807c78d04c6097 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Fri, 9 Dec 2022 10:04:34 +0000
Subject: T4868: Fix l2tp ppp IPv6 options in template and config get dict

L2TP 'ppp-options ipv6 x' can work without declaring IPv6 pool
As we can get addresses via RADIUS attributes:
  - Framed-IPv6-Prefix
  - Delegated-IPv6-Prefix
---
 data/templates/accel-ppp/l2tp.config.j2 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'data/templates/accel-ppp/l2tp.config.j2')

diff --git a/data/templates/accel-ppp/l2tp.config.j2 b/data/templates/accel-ppp/l2tp.config.j2
index 986f19656..3d1e835a9 100644
--- a/data/templates/accel-ppp/l2tp.config.j2
+++ b/data/templates/accel-ppp/l2tp.config.j2
@@ -121,8 +121,10 @@ lcp-echo-failure={{ ppp_echo_failure }}
 {% if ccp_disable %}
 ccp=0
 {% endif %}
-{% if client_ipv6_pool %}
-ipv6=allow
+{% if ppp_ipv6 is vyos_defined %}
+ipv6={{ ppp_ipv6 }}
+{% else %}
+{{ 'ipv6=allow' if client_ipv6_pool_configured else '' }}
 {% endif %}
 
 
-- 
cgit v1.2.3