diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2022-04-08 18:54:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 18:54:44 +0300 |
| commit | f43031ec4591662fadee3176fe1ace2ac018a9df (patch) | |
| tree | 9c96321f2432ee11db826a7051b4b5adefc030c5 /data/templates/dhcp-relay/dhcrelay6.conf.tmpl | |
| parent | b75b351b7dd2ec87407f98668468b1fc146428bf (diff) | |
| parent | 2bf7589e926b3d5f2f7aee0f98505eeb14fc826d (diff) | |
| download | vyos-1x-f43031ec4591662fadee3176fe1ace2ac018a9df.tar.gz vyos-1x-f43031ec4591662fadee3176fe1ace2ac018a9df.zip | |
Merge branch 'current' into T4344
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 }}" |