1 files changed, 8 insertions, 0 deletions
diff --git a/data/templates/dhcp-server/dhcpdv6.conf.j2 b/data/templates/dhcp-server/dhcpdv6.conf.j2
index 284b7f269..43327859e 100644
--- a/data/templates/dhcp-server/dhcpdv6.conf.j2
+++ b/data/templates/dhcp-server/dhcpdv6.conf.j2
@@ -11,6 +11,11 @@ option dhcp6.preference {{ preference }};
 {% if global_parameters.name_server is vyos_defined %}
 option dhcp6.name-servers {{ global_parameters.name_server | join(', ') }};
 {% endif %}
+{% if vsio_cisco_tftp %}
+option space cisco;
+option cisco.tftp-servers code 1 = array of ip6-address;
+option vsio.cisco code 9 = encapsulate cisco;
+{% endif %}
 
 # Shared network configration(s)
 {% if shared_network_name is vyos_defined %}
@@ -113,6 +118,9 @@ shared-network {{ network }} {
         }
 {%                     endfor %}
 {%                 endif %}
+{%                 if subnet_config.vsio.cisco.tftp_server is vyos_defined %}
+        option cisco.tftp-servers {{ subnet_config.vsio.cisco.tftp_server | join(', ') }};
+{%                 endif %}
     }
 {%             endfor %}
 {%         endif %}