summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-03-03 00:17:54 +0100
committerChristian Poessinger <christian@poessinger.com>2021-03-03 00:17:54 +0100
commita56ecbd9566a193fd64681716232d813fc0f0e85 (patch)
treed0db259a0a7ea4b17fad75c36f13513f1050e229 /data
parentaf609001364404e0b53ac3ee31ac75de54325ecb (diff)
parent117533482d29ce0bd1bc7f3a3f2536921c16565c (diff)
downloadvyos-1x-a56ecbd9566a193fd64681716232d813fc0f0e85.tar.gz
vyos-1x-a56ecbd9566a193fd64681716232d813fc0f0e85.zip
Merge branch 'T3379' of https://github.com/sever-sever/vyos-1x into current
* 'T3379' of https://github.com/sever-sever/vyos-1x: dhcpv6-server: T3379: Add option global-parameters name-server
Diffstat (limited to 'data')
-rw-r--r--data/templates/dhcp-server/dhcpdv6.conf.tmpl6
1 files changed, 6 insertions, 0 deletions
diff --git a/data/templates/dhcp-server/dhcpdv6.conf.tmpl b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
index de7c9b29c..25e5fa592 100644
--- a/data/templates/dhcp-server/dhcpdv6.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpdv6.conf.tmpl
@@ -8,6 +8,12 @@ log-facility local7;
option dhcp6.preference {{ preference }};
{% endif %}
+{% if global_parameters is defined and global_parameters.name_server is defined and global_parameters.name_server is not none %}
+{% for nameserver in global_parameters.name_server %}
+option dhcp6.name-servers {{ nameserver }};
+{% endfor %}
+{% endif %}
+
# Shared network configration(s)
{% if shared_network_name is defined and shared_network_name is not none %}
{% for network, network_config in shared_network_name.items() if network_config.disable is not defined %}