Skip to content

net/frr: Implement frr.conf file#4528

Merged
Monviech merged 4 commits intomasterfrom
frr-conf
Feb 13, 2025
Merged

net/frr: Implement frr.conf file#4528
Monviech merged 4 commits intomasterfrom
frr-conf

Conversation

@Monviech
Copy link
Copy Markdown
Member

@Monviech Monviech commented Feb 4, 2025

Fixes: #4510
Fixes: #4534

Requires the new rc.d script from: opnsense/ports@f005f9c

! Zebra configuration saved from vty
! 2017/03/03 20:21:04
!
{% if helpers.exists('OPNsense.quagga.general') %}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As information why this has been removed:

frr defaults and log syslog only need to be declared once in the frr.conf file, which is why in zebra.conf these lines exist, but in the other conf files they have been removed.

!
!
!
{% set passive_interfaces = [] %}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This here is the passive interface rewrite to make it compatible with frr-reload.

@@ -1,13 +1,7 @@
bfdd.conf:/usr/local/etc/frr/bfdd.conf
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be missing something, but how this file populated now? (same as the ones below)

Copy link
Copy Markdown
Member Author

@Monviech Monviech Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file will not be generated anymore. It is now part of frr.conf as include and will be generated inside of it.

https://github.com/opnsense/plugins/blob/355b0939d0cc678a35c2f36369785882dd40f15f/net/frr/src/opnsense/service/templates/OPNsense/Quagga/frr.conf

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(face-palm) for some reason I misread the includes, these are jinja includes, thanks for pointing that out

@fichtner
Copy link
Copy Markdown
Member

I would suggest removing the old conf files via setup.sh

@Monviech
Copy link
Copy Markdown
Member Author

I would suggest removing the old conf files via setup.sh

In my tests they were ignored and only frr.conf was used. I want to try without deleting anything first.

@Monviech
Copy link
Copy Markdown
Member Author

If something comes up in my final tests I will create a new PR for file deletion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

net/frr: Resolve deprecated options in template net/frr: Migrate to frr.conf file

3 participants