diff options
| -rw-r--r-- | data/templates/firewall/nftables-vrf-zones.j2 (renamed from data/templates/firewall/nftables-vrf-zones.tmpl) | 0 | ||||
| -rw-r--r-- | data/templates/vrf/vrf.conf.j2 (renamed from data/templates/vrf/vrf.conf.tmpl) | 4 | ||||
| -rwxr-xr-x | src/conf_mode/vrf.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/templates/firewall/nftables-vrf-zones.tmpl b/data/templates/firewall/nftables-vrf-zones.j2 index eecf47b78..eecf47b78 100644 --- a/data/templates/firewall/nftables-vrf-zones.tmpl +++ b/data/templates/firewall/nftables-vrf-zones.j2 diff --git a/data/templates/vrf/vrf.conf.tmpl b/data/templates/vrf/vrf.conf.j2 index a51e11ddf..d31d23574 100644 --- a/data/templates/vrf/vrf.conf.tmpl +++ b/data/templates/vrf/vrf.conf.j2 @@ -3,7 +3,7 @@ # Routing table ID to name mapping reference # id vrf name comment {% if name is vyos_defined %} -{% for vrf, vrf_config in name.items() %} +{% for vrf, vrf_config in name.items() %} {{ "%-10s" | format(vrf_config.table) }} {{ "%-16s" | format(vrf) }} {{ '# ' ~ vrf_config.description if vrf_config.description is vyos_defined }} -{% endfor %} +{% endfor %} {% endif %} diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py index f79c8a21e..f2d041083 100755 --- a/src/conf_mode/vrf.py +++ b/src/conf_mode/vrf.py @@ -133,10 +133,10 @@ def verify(vrf): def generate(vrf): - render(config_file, 'vrf/vrf.conf.tmpl', vrf) + render(config_file, 'vrf/vrf.conf.j2', vrf) # Render nftables zones config - render(nft_vrf_config, 'firewall/nftables-vrf-zones.tmpl', vrf) + render(nft_vrf_config, 'firewall/nftables-vrf-zones.j2', vrf) return None |