diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-04-08 14:48:17 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-04-08 14:48:17 +0200 |
| commit | 654dbc9aa3b0d27ec4f3faefff6cbd85fc3e1d1a (patch) | |
| tree | 45700682fc803d6fba0fd38cbc064d27e9f2cd89 /data/templates/dhcp-relay/dhcrelay6.conf.tmpl | |
| parent | d8f778456761124683443400a9182a39714268f4 (diff) | |
| download | vyos-1x-654dbc9aa3b0d27ec4f3faefff6cbd85fc3e1d1a.tar.gz vyos-1x-654dbc9aa3b0d27ec4f3faefff6cbd85fc3e1d1a.zip | |
dhcp(v6): T4333: migrate to new vyos_defined Jinja2 test
Diffstat (limited to 'data/templates/dhcp-relay/dhcrelay6.conf.tmpl')
| -rw-r--r-- | data/templates/dhcp-relay/dhcrelay6.conf.tmpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl b/data/templates/dhcp-relay/dhcrelay6.conf.tmpl index 58c216b7c..1fd5de18c 100644 --- a/data/templates/dhcp-relay/dhcrelay6.conf.tmpl +++ b/data/templates/dhcp-relay/dhcrelay6.conf.tmpl @@ -4,18 +4,18 @@ {% set upstream = namespace(value='') %} {% for interface, config in upstream_interface.items() %} {% for address in config.address %} -{% set upstream.value = upstream.value + '-u ' + address + '%' + interface + ' ' %} +{% set upstream.value = upstream.value ~ '-u ' ~ address ~ '%' ~ interface ~ ' ' %} {% endfor %} {% endfor %} {# listen_interface is mandatory so it's always present #} {% set listen = namespace(value='') %} {% for interface, config in listen_interface.items() %} -{% if config.address is defined and config.address is not none %} -{% set listen.value = listen.value + '-l ' + config.address + '%' + interface + ' ' %} +{% if config.address is vyos_defined %} +{% set listen.value = listen.value ~ '-l ' ~ config.address ~ '%' ~ interface ~ ' ' %} {% else %} -{% set listen.value = listen.value + '-l ' + interface + ' ' %} +{% set listen.value = listen.value ~ '-l ' ~ interface ~ ' ' %} {% endif %} {% endfor %} -OPTIONS="{{ listen.value }} {{ upstream.value }} -c {{ max_hop_count }} {{ '-I' if use_interface_id_option is defined }}" +OPTIONS="{{ listen.value }} {{ upstream.value }} -c {{ max_hop_count }} {{ '-I' if use_interface_id_option is vyos_defined }}" |