3 files changed, 8 insertions, 5 deletions
diff --git a/data/templates/dhcp-client/ipv6.tmpl b/data/templates/dhcp-client/ipv6.tmpl
index 6cfe24d3e..490f14726 100644
--- a/data/templates/dhcp-client/ipv6.tmpl
+++ b/data/templates/dhcp-client/ipv6.tmpl
@@ -10,7 +10,7 @@ interface {{ ifname }} {
 {%  if not dhcpv6_temporary %}
     send ia-na 1; # non-temporary address
 {%  endif %}
-{%  if dhcpv6_pd %}
+{%  if dhcpv6_pd_interfaces %}
     send ia-pd 2; # prefix delegation
 {%  endif %}
 };
@@ -21,9 +21,12 @@ id-assoc na 1 {
 };
 {%  endif %}
 
-{%  if dhcpv6_pd %}
+{%  if dhcpv6_pd_interfaces %}
 id-assoc pd 2 {
-{%  for intf in dhcpv6_pd %}
+{%  if dhcpv6_pd_length %}
+    prefix ::/{{ dhcpv6_pd_length }} infinity;
+{%  endif %}
+{%  for intf in dhcpv6_pd_interfaces %}
     prefix-interface {{ intf.ifname }} {
 {%    if intf.sla_id %}
         sla-id {{ intf.sla_id }};
diff --git a/data/templates/pppoe/ip-down.script.tmpl b/data/templates/pppoe/ip-down.script.tmpl
index fe8fd7584..c4e11b6b4 100644
--- a/data/templates/pppoe/ip-down.script.tmpl
+++ b/data/templates/pppoe/ip-down.script.tmpl
@@ -27,7 +27,7 @@ fi
 vtysh -c "conf t" ${VRF_NAME} -c "no ip route 0.0.0.0/0 {{ intf }} ${VRF_NAME}"
 {% endif %}
 
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
 # Start wide dhcpv6 client
 systemctl stop dhcp6c@{{ intf }}.service
 {% endif %}
diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
index 90873229a..e795d5b0c 100644
--- a/data/templates/pppoe/ipv6-up.script.tmpl
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -40,7 +40,7 @@ echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra
 echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure
 {% endif %}
 
-{% if dhcpv6_pd %}
+{% if dhcpv6_pd_interfaces %}
 # Start wide dhcpv6 client
 systemctl start dhcp6c@{{ intf }}.service
 {% endif %}