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

ovn: fix missing ovsdb binaries #372478

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Conversation

positiveEV
Copy link
Contributor

Hi @adamcstephens ,

Last time, I forgot the most important items: the OVSDB binaries.
This time I tested it in a nix-shell --pure so that me PATH was clean.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 9, 2025
@nix-owners nix-owners bot requested a review from adamcstephens January 9, 2025 20:45
@adamcstephens
Copy link
Contributor

This feels a bit wrong, since we also have an openvswitch package, but if ovn expects these here we'll go with it. I originally tried to use our openvswitch directly, but failed. :/

@adamcstephens adamcstephens merged commit a5ab1e5 into NixOS:master Jan 9, 2025
23 of 27 checks passed
@positiveEV
Copy link
Contributor Author

I have the same feeling, but the ovsdb-server is mandatory to run the OVN northbound and southbound databases, and we might want to run them on a different host than the ovn-controller, which actually requires Open vSwitch (ovs-vswitchd). That's why I believe it should be included in the OVN package.

Another solution would be to create an Open vSwitch package that includes only ovsdb-client, ovsdb-server, and ovsdb-tool, and then add this package as a dependency of the OVN package, similar to how Debian handles openvswitch-common. However, I don't think this approach aligns with the Nix philosophy and may complicate maintenance.

There is also the workaround that I am currently using which is to add pkgs.openvswitch to the systemd.services.<name>.path option of the ovn-nb-ovsdb service.

@adamcstephens
Copy link
Contributor

I suspect we don't want to use the nixpkgs openvswitch package for binaries unless we're also compiling ovn against that same package/version.

This PR is fine for now. :)

Are you hoping to use this work on stable? Or, since you're really doing the development on this, is unstable ok for your needs for now? Wondering if we need to keep backporting these or if we can target 25.05 for a more useful release with ovn.

@positiveEV
Copy link
Contributor Author

Since we don't want to use the binaries from the openvswitch pkg, which I also think is the logical thing to do, I am going to try to include what is needed to run vswitchd and its ovsdb-server in the ovn pkg.
So there is no need to backport it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants