diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-12-04 19:46:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 19:46:56 +0100 |
| commit | 8d3e287d028d3fc92256cc86988c06ca5301c7c1 (patch) | |
| tree | b4e9d1a41a8f86f00aa84fc27795fb8b56aadf9a /data/templates/accel-ppp/config_ip_pool.j2 | |
| parent | f26d788008fe187e00a8afe59ff4bfdace51866d (diff) | |
| parent | 422eb463d413da812eabc28706e507a9910d7b53 (diff) | |
| download | vyos-1x-8d3e287d028d3fc92256cc86988c06ca5301c7c1.tar.gz vyos-1x-8d3e287d028d3fc92256cc86988c06ca5301c7c1.zip | |
Merge pull request #2501 from aapostoliuk/T5688-current
accel-ppp: T5688: Standardized pool configuration in accel-ppp
Diffstat (limited to 'data/templates/accel-ppp/config_ip_pool.j2')
| -rw-r--r-- | data/templates/accel-ppp/config_ip_pool.j2 | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/data/templates/accel-ppp/config_ip_pool.j2 b/data/templates/accel-ppp/config_ip_pool.j2 index f7511e445..c567236a4 100644 --- a/data/templates/accel-ppp/config_ip_pool.j2 +++ b/data/templates/accel-ppp/config_ip_pool.j2 @@ -1,24 +1,22 @@ -{% if client_ip_pool is vyos_defined %} +{% if ordered_named_pools is vyos_defined %} [ip-pool] {% if gateway_address is vyos_defined %} +{% if server_type == 'ipoe' %} +{% for gw in gateway_address %} +{% set host_address, _ = gw.split('/') %} +gw-ip-address={{ host_address }} +{% endfor %} +{% else %} gw-ip-address={{ gateway_address }} +{% endif %} {% endif %} -{% if client_ip_pool.start is vyos_defined and client_ip_pool.stop is vyos_defined %} -{{ client_ip_pool.start }}-{{ client_ip_pool.stop.split('.')[3] }} -{% endif %} -{% if client_ip_pool.subnet is vyos_defined %} -{% for subnet in client_ip_pool.subnet %} -{{ subnet }} -{% endfor %} -{% endif %} -{% if client_ip_pool.name is vyos_defined %} -{% for pool, pool_config in client_ip_pool.name.items() %} -{% if pool_config.subnet is vyos_defined %} -{{ pool_config.subnet }},name={{ pool }} -{% endif %} -{% if pool_config.gateway_address is vyos_defined %} -gw-ip-address={{ pool_config.gateway_address }} +{% for pool in ordered_named_pools %} +{% for pool_name, pool_config in pool.items() %} +{% if pool_config.next_pool is vyos_defined %} +{{ pool_config.range }},name={{ pool_name }},next={{ pool_config.next_pool }} +{% else %} +{{ pool_config.range }},name={{ pool_name }} {% endif %} {% endfor %} -{% endif %} +{% endfor %} {% endif %}
\ No newline at end of file |