[VyOS] GRE tunnel implementation#3566
Open
ssasso wants to merge 2 commits into
Open
Conversation
ipspace
reviewed
Jul 2, 2026
| {% if vlans is defined %} | ||
| {% include 'vyos.vlan.j2' %} | ||
| {% endif %} | ||
| {% if "tunnel.gre" in config|default([]) %} |
Owner
There was a problem hiding this comment.
Here's another option if you want to keep all config in the 'extra/tunnel.gre' directory:
- Move vyos.tunnel.j2 into
extra/tunnel.gre/vyos-interfaces.j2 - Replace this if block with the following loop:
-{% if "tunnel.gre" in config|default([]) %}
-{% include 'vyos.tunnel.j2' %}
-{% endif %}
+{% for x_dp in config|default([]) %}
+{% include x_dp + '/' + 'vyos-interfaces.j2' ignore missing %}
+{% endfor %}
You could do the same for regular modules (vlans/vrfs).
Just a thought, I'm perfectly fine merging this as-is (after fixing the integration test and running them ;)
Collaborator
There was a problem hiding this comment.
- Move vyos.tunnel.j2 into
extra/tunnel.gre/vyos-interfaces.j2
or extra/tunnel.gre/vyos-initial.j2 to emphasize it extends the initial configuration
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Main configuration performed in 'initial' module, due to #3564
Requires fixing #3563 for test '01-gre.yaml' to work.
With a local fix:
Test 01:
Test 02: