summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-11-29 12:30:35 +0100
committerChristian Poessinger <christian@poessinger.com>2020-11-29 12:30:35 +0100
commitcacbc208d0802806de2c671e41607d605138aaa5 (patch)
treeb7e479ade5f090b69830e19c24b575ed7ea1fed3 /data
parentb474b60a8c4240858d8abdcdbeb555b85452a517 (diff)
parentd6974be8d96cae21dde6bfa40fe568db3d3ef04f (diff)
downloadvyos-1x-cacbc208d0802806de2c671e41607d605138aaa5.tar.gz
vyos-1x-cacbc208d0802806de2c671e41607d605138aaa5.zip
Merge branch 'dhcp-relay' of github.com:c-po/vyos-1x into current
* 'dhcp-relay' of github.com:c-po/vyos-1x: dhcp-relay: T3095: migrate service to get_config_dict() smoketest: dhcp-relay: T3095: initial tests
Diffstat (limited to 'data')
-rw-r--r--data/templates/dhcp-relay/config.tmpl4
-rw-r--r--data/templates/dhcp-relay/dhcrelay.conf.tmpl6
2 files changed, 6 insertions, 4 deletions
diff --git a/data/templates/dhcp-relay/config.tmpl b/data/templates/dhcp-relay/config.tmpl
deleted file mode 100644
index b223807cf..000000000
--- a/data/templates/dhcp-relay/config.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-### Autogenerated by dhcp_relay.py ###
-
-# Defaults for isc-dhcp-relay6.service
-OPTIONS="{{ options | join(' ') }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
diff --git a/data/templates/dhcp-relay/dhcrelay.conf.tmpl b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
new file mode 100644
index 000000000..df990207b
--- /dev/null
+++ b/data/templates/dhcp-relay/dhcrelay.conf.tmpl
@@ -0,0 +1,6 @@
+### Autogenerated by dhcp_relay.py ###
+
+{% set max_size = '-A ' + relay_options.max_size if relay_options.max_size is defined and relay_options.max_size is not none %}
+{# hop_count and relay_agents_packets is a default option, thus it is always present #}
+OPTIONS="-4 -c {{ relay_options.hop_count }} -a -m {{ relay_options.relay_agents_packets }} {{ max_size }} -i {{ interface | join(' -i ') }} {{ server | join(' ') }}"
+