Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ncm-network: Move nmstate options to new schema #1720

Merged
merged 6 commits into from
Nov 6, 2024

Conversation

jrha
Copy link
Member

@jrha jrha commented Sep 20, 2024

@aka7 as promised this splits out the nmstate specific parts of the schema into the new structure @stdweird designed.

This also defaults to using the new schema and to be honest I don't see a reason to keep the legacy schema file around.

Backwards incompatible from 23.6.0 for anyone setting "nm_manage_dns" = true or more generally for any sites using the current code from master.

@@ -2,7 +2,7 @@

declaration template components/network/core-schema;

final variable QUATTOR_TYPES_NETWORK_LEGACY ?= true;
final variable QUATTOR_TYPES_NETWORK_LEGACY ?= false;
Copy link
Member

Choose a reason for hiding this comment

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

@jrha @ned21 @jouvin i suppose we should give sites one or 2 weeks time to compare generated profiles with changing this boolean.

Copy link
Contributor

Choose a reason for hiding this comment

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

👍 @aka7 is probably the best person to do that for MS. We have pretty good tools for this so it should be easy to generate, but may take a little bit to analyse any differences.

Copy link
Contributor

Choose a reason for hiding this comment

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

@jrha thank you for this.

I plan to look into this next week.
I suspect backward incompatibility will be with nm_clean_inactive_conn too.

@aka7
Copy link
Contributor

aka7 commented Sep 25, 2024

@jrha the backward incompatible is ok with us, We probably need to move manage_vips into nmstate path, because that is currently only for nsmstate, unless we plan to look at creating loopback interface for network.pm? If we are going have backward incompatible change, its worth looking at other nmstate on options I added recently. like the priority option added for nmstate config.

but I'm struggling to override the two variable introduced in the schema at os level, the network types are included early on in quattor/types/system.pan (in our setup at least). So I'll be interested to know how others are going override these values QUATTOR_TYPES_NETWORK_BACKEND or QUATTOR_TYPES_NETWORK_LEGACY.

Has anyone else tested this? cc @stdweird ?

aka7
aka7 previously approved these changes Sep 30, 2024
Copy link
Contributor

@aka7 aka7 left a comment

Choose a reason for hiding this comment

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

Tested this internally at ms, LGTM.
Other than the comment made about overriding the variables. and we can possibly move other options into nmstate schema, this can be done later separate PR once this is merged?
Others should test and confirm though.

@aka7
Copy link
Contributor

aka7 commented Oct 7, 2024

@stdweird @jrha just checking what is decision on this? At ms, we have tested this, with caveat that you can't override the two global variables early on before the network schema is included, but with some refactoring in our template code we can achieve this by putting in some logic to set the right values we need, legacy, vs initscripts, vs nmstate. And we are ok with backward incompatibility.

I ask this, because there additional changes I have in flight which I'll create pr once this is merged. Also we are looking to go GA with rhel9 before the end of the year so any major changes, I would like to get this in before we go GA. hope this makes sense.

thanks for your help.

@jrha
Copy link
Member Author

jrha commented Oct 21, 2024

Sorry for the delay, we've tested this at RAL with no resulting changes to host profiles, so we're happy and I'd like to go ahead and remove the legacy schema.

@stdweird
Copy link
Member

@jrha 👍

@jrha
Copy link
Member Author

jrha commented Oct 22, 2024

I've done the removal of legacy in #1725.

@jrha jrha merged commit 6a63bb9 into quattor:master Nov 6, 2024
2 checks passed
@jrha jrha deleted the nmstate_schema branch November 6, 2024 10:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants